Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c6e6ca712b5cc06a662f900c0484d49d7334af64
Commit: c6e6ca712b5cc06a662f900c0484d49d7334af64
Parent: 1d0691674764098304ae4c63c715f5883b4d3784
Author: David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 20 00:25:54 2007 -0800
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Dec 20 00:25:54 2007 -0800
[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 <[EMAIL PROTECTED]>
---
net/ax25/ax25_in.c | 2 +-
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 3b7d172..d1be080 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 8c68da5..6caf459 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
