git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Bluetooth] Fix L2CAP configuration parameter handling
[pandora-kernel.git]
/
net
/
wanrouter
/
wanmain.c
diff --git
a/net/wanrouter/wanmain.c
b/net/wanrouter/wanmain.c
index
5d2d93d
..
7a19e0e
100644
(file)
--- 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,
skb_push(skb, 7);
skb->data[0] = 0;
skb->data[1] = NLPID_SNAP;
skb_push(skb, 7);
skb->data[0] = 0;
skb->data[1] = NLPID_SNAP;
-
memcpy(&skb->data[2]
, wanrouter_oui_ether,
- sizeof(wanrouter_oui_ether));
+
skb_copy_to_linear_data_offset(skb, 2
, wanrouter_oui_ether,
+
sizeof(wanrouter_oui_ether));
*((unsigned short*)&skb->data[5]) = htons(type);
break;
*((unsigned short*)&skb->data[5]) = htons(type);
break;
@@
-339,7
+339,7
@@
__be16 wanrouter_type_trans(struct sk_buff *skb, struct net_device *dev)
skb->protocol = ethertype;
skb->pkt_type = PACKET_HOST; /* Physically point to point */
skb_pull(skb, cnt);
skb->protocol = ethertype;
skb->pkt_type = PACKET_HOST; /* Physically point to point */
skb_pull(skb, cnt);
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
return ethertype;
}
return ethertype;
}