diff options
| author | David Miller <davem@davemloft.net> | 2008-01-11 01:31:39 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-08 12:01:24 -0800 |
| commit | 02f5ff7df69ec84404907e095b6bed86417ebb03 (patch) | |
| tree | e53c50b24029383b04a1f151fdf294d3ca85687e | |
| parent | d7ebea7d9e242d5eb968c9512d323f15c3894e20 (diff) | |
NET: Correct two mistaken skb_reset_mac_header() conversions.
[NET]: Correct two mistaken skb_reset_mac_header() conversions.
[ Upstream commit: c6e6ca712b5cc06a662f900c0484d49d7334af64 ]
This operation helper abstracts:
skb->mac_header = skb->data;
but it was done in two more places which were actually:
skb->mac_header = skb->network_header;
and those are corrected here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | net/ax25/ax25_in.c | 2 | ||||
| -rw-r--r-- | net/netrom/nr_dev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_in.c b/net/ax25/ax25_in.c index 0ddaff0df217..8a9f0ac41564 100644 --- a/net/ax25/ax25_in.c +++ b/net/ax25/ax25_in.c @@ -124,7 +124,7 @@ int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb) } skb_pull(skb, 1); /* Remove PID */ - skb_reset_mac_header(skb); + skb->mac_header = skb->network_header; skb_reset_network_header(skb); skb->dev = ax25->ax25_dev->dev; skb->pkt_type = PACKET_HOST; diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index c7b5d930e732..69e77d540890 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c @@ -56,7 +56,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) /* Spoof incoming device */ skb->dev = dev; - skb_reset_mac_header(skb); + skb->mac_header = skb->network_header; skb_reset_network_header(skb); skb->pkt_type = PACKET_HOST; |