Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150804
b: refs/heads/master
c: dacb6f1
h: refs/heads/master
v: v3
  • Loading branch information
matthieu castet authored and John W. Linville committed Jun 10, 2009
1 parent a398e30 commit e4f26ce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b52a033c2c501a8015df3727a4bd73389ccb1641
refs/heads/master: dacb6f1d8fa5200efc4e609fe63a750b960993b6
2 changes: 1 addition & 1 deletion trunk/net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
* mac80211. That also explains the __skb_push()
* below.
*/
align = (unsigned long)skb->data & 3;
align = ((unsigned long)(skb->data + sizeof(struct ethhdr))) & 3;
if (align) {
if (WARN_ON(skb_headroom(skb) < 3)) {
dev_kfree_skb(skb);
Expand Down

0 comments on commit e4f26ce

Please sign in to comment.