Skip to content

Commit

Permalink
[NET]: Correct two mistaken skb_reset_mac_header() conversions.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Dec 20, 2007
1 parent 1d06916 commit c6e6ca7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion net/ax25/ax25_in.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion net/netrom/nr_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit c6e6ca7

Please sign in to comment.