projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[linux-2.6-block.git]
/
net
/
wireless
/
util.c
diff --git
a/net/wireless/util.c
b/net/wireless/util.c
index 4e809e978b7d274f3967349c87acda43aac57370..2443ee30ba5b6b0b2844af1cd28d7aa986e44bbf 100644
(file)
--- a/
net/wireless/util.c
+++ b/
net/wireless/util.c
@@
-509,7
+509,7
@@
static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr,
* replace EtherType */
hdrlen += ETH_ALEN + 2;
else
- tmp.h_proto = htons(skb->len);
+ tmp.h_proto = htons(skb->len
- hdrlen
);
pskb_pull(skb, hdrlen);