diff options
| -rw-r--r-- | net/mac80211/rx.c | 6 | ||||
| -rw-r--r-- | net/mac80211/wme.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 9c57b3af0244..1958bfb361c6 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -1395,7 +1395,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) | |||
| 1395 | padding = ((4 - subframe_len) & 0x3); | 1395 | padding = ((4 - subframe_len) & 0x3); |
| 1396 | /* the last MSDU has no padding */ | 1396 | /* the last MSDU has no padding */ |
| 1397 | if (subframe_len > remaining) { | 1397 | if (subframe_len > remaining) { |
| 1398 | printk(KERN_DEBUG "%s: wrong buffer size", dev->name); | 1398 | printk(KERN_DEBUG "%s: wrong buffer size\n", dev->name); |
| 1399 | return RX_DROP_UNUSABLE; | 1399 | return RX_DROP_UNUSABLE; |
| 1400 | } | 1400 | } |
| 1401 | 1401 | ||
| @@ -1418,7 +1418,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx_data *rx) | |||
| 1418 | eth = (struct ethhdr *) skb_pull(skb, ntohs(len) + | 1418 | eth = (struct ethhdr *) skb_pull(skb, ntohs(len) + |
| 1419 | padding); | 1419 | padding); |
| 1420 | if (!eth) { | 1420 | if (!eth) { |
| 1421 | printk(KERN_DEBUG "%s: wrong buffer size ", | 1421 | printk(KERN_DEBUG "%s: wrong buffer size\n", |
| 1422 | dev->name); | 1422 | dev->name); |
| 1423 | dev_kfree_skb(frame); | 1423 | dev_kfree_skb(frame); |
| 1424 | return RX_DROP_UNUSABLE; | 1424 | return RX_DROP_UNUSABLE; |
| @@ -1952,7 +1952,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, | |||
| 1952 | if (!skb_new) { | 1952 | if (!skb_new) { |
| 1953 | if (net_ratelimit()) | 1953 | if (net_ratelimit()) |
| 1954 | printk(KERN_DEBUG "%s: failed to copy " | 1954 | printk(KERN_DEBUG "%s: failed to copy " |
| 1955 | "multicast frame for %s", | 1955 | "multicast frame for %s\n", |
| 1956 | wiphy_name(local->hw.wiphy), | 1956 | wiphy_name(local->hw.wiphy), |
| 1957 | prev->dev->name); | 1957 | prev->dev->name); |
| 1958 | continue; | 1958 | continue; |
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index 64faa3dc488f..dc1598b86004 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
| @@ -394,7 +394,8 @@ static int wme_qdiscop_init(struct Qdisc *qd, struct nlattr *opt) | |||
| 394 | qd->handle); | 394 | qd->handle); |
| 395 | if (!q->queues[i]) { | 395 | if (!q->queues[i]) { |
| 396 | q->queues[i] = &noop_qdisc; | 396 | q->queues[i] = &noop_qdisc; |
| 397 | printk(KERN_ERR "%s child qdisc %i creation failed", dev->name, i); | 397 | printk(KERN_ERR "%s child qdisc %i creation failed\n", |
| 398 | dev->name, i); | ||
| 398 | } | 399 | } |
| 399 | } | 400 | } |
| 400 | 401 | ||
