diff options
Diffstat (limited to 'net/wanrouter/wanmain.c')
-rw-r--r-- | net/wanrouter/wanmain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 5d2d93dc0837..7a19e0ede289 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
@@ -277,8 +277,8 @@ int wanrouter_encapsulate(struct sk_buff *skb, struct net_device *dev, | |||
277 | skb_push(skb, 7); | 277 | skb_push(skb, 7); |
278 | skb->data[0] = 0; | 278 | skb->data[0] = 0; |
279 | skb->data[1] = NLPID_SNAP; | 279 | skb->data[1] = NLPID_SNAP; |
280 | memcpy(&skb->data[2], wanrouter_oui_ether, | 280 | skb_copy_to_linear_data_offset(skb, 2, wanrouter_oui_ether, |
281 | sizeof(wanrouter_oui_ether)); | 281 | sizeof(wanrouter_oui_ether)); |
282 | *((unsigned short*)&skb->data[5]) = htons(type); | 282 | *((unsigned short*)&skb->data[5]) = htons(type); |
283 | break; | 283 | break; |
284 | 284 | ||
@@ -339,7 +339,7 @@ __be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
339 | skb->protocol = ethertype; | 339 | skb->protocol = ethertype; |
340 | skb->pkt_type = PACKET_HOST; /* Physically point to point */ | 340 | skb->pkt_type = PACKET_HOST; /* Physically point to point */ |
341 | skb_pull(skb, cnt); | 341 | skb_pull(skb, cnt); |
342 | skb->mac.raw = skb->data; | 342 | skb_reset_mac_header(skb); |
343 | return ethertype; | 343 | return ethertype; |
344 | } | 344 | } |
345 | 345 | ||