Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96561
b: refs/heads/master
c: a4278e1
h: refs/heads/master
i:
  96559: 969b151
v: v3
  • Loading branch information
Pavel Roskin authored and John W. Linville committed May 13, 2008
1 parent 4ea7987 commit b205f8e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 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: 6fc7431dc0775f21ad7a7a39c2ad0290291a56ea
refs/heads/master: a4278e18e7e497b76781492d010035c3c36f7403
6 changes: 3 additions & 3 deletions trunk/net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
padding = ((4 - subframe_len) & 0x3);
/* the last MSDU has no padding */
if (subframe_len > remaining) {
printk(KERN_DEBUG "%s: wrong buffer size", dev->name);
printk(KERN_DEBUG "%s: wrong buffer size\n", dev->name);
return RX_DROP_UNUSABLE;
}

Expand All @@ -1418,7 +1418,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx)
eth = (struct ethhdr *) skb_pull(skb, ntohs(len) +
padding);
if (!eth) {
printk(KERN_DEBUG "%s: wrong buffer size ",
printk(KERN_DEBUG "%s: wrong buffer size\n",
dev->name);
dev_kfree_skb(frame);
return RX_DROP_UNUSABLE;
Expand Down Expand Up @@ -1952,7 +1952,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
if (!skb_new) {
if (net_ratelimit())
printk(KERN_DEBUG "%s: failed to copy "
"multicast frame for %s",
"multicast frame for %s\n",
wiphy_name(local->hw.wiphy),
prev->dev->name);
continue;
Expand Down
3 changes: 2 additions & 1 deletion trunk/net/mac80211/wme.c
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt)
qd->handle);
if (!q->queues[i]) {
q->queues[i] = &noop_qdisc;
printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i);
printk(KERN_ERR "%s child qdisc %i creation failed\n",
dev->name, i);
}
}

Expand Down

0 comments on commit b205f8e

Please sign in to comment.