diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-12-20 03:25:54 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-20 03:25:54 -0500 |
commit | c6e6ca712b5cc06a662f900c0484d49d7334af64 (patch) | |
tree | 2970917a32e2894a0dbb87fcb9f351baa0d8d125 | |
parent | 1d0691674764098304ae4c63c715f5883b4d3784 (diff) |
[NET]: Correct two mistaken skb_reset_mac_header() conversions.
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>
-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 3b7d1720c2ee..d1be080dcb25 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) | |||
124 | } | 124 | } |
125 | 125 | ||
126 | skb_pull(skb, 1); /* Remove PID */ | 126 | skb_pull(skb, 1); /* Remove PID */ |
127 | skb_reset_mac_header(skb); | 127 | skb->mac_header = skb->network_header; |
128 | skb_reset_network_header(skb); | 128 | skb_reset_network_header(skb); |
129 | skb->dev = ax25->ax25_dev->dev; | 129 | skb->dev = ax25->ax25_dev->dev; |
130 | skb->pkt_type = PACKET_HOST; | 130 | skb->pkt_type = PACKET_HOST; |
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 8c68da5ef0a1..6caf459665f2 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) | |||
56 | 56 | ||
57 | /* Spoof incoming device */ | 57 | /* Spoof incoming device */ |
58 | skb->dev = dev; | 58 | skb->dev = dev; |
59 | skb_reset_mac_header(skb); | 59 | skb->mac_header = skb->network_header; |
60 | skb_reset_network_header(skb); | 60 | skb_reset_network_header(skb); |
61 | skb->pkt_type = PACKET_HOST; | 61 | skb->pkt_type = PACKET_HOST; |
62 | 62 | ||