|
@@ -341,8 +341,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb,
|
|
|
!(ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)) ||
|
|
|
((!ieee->softmac_data_hard_start_xmit &&
|
|
|
(ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)))) {
|
|
|
- printk(KERN_WARNING "%s: No xmit handler.\n",
|
|
|
- ieee->dev->name);
|
|
|
+ netdev_warn(ieee->dev, "No xmit handler.\n");
|
|
|
goto success;
|
|
|
}
|
|
|
|
|
@@ -350,8 +349,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb,
|
|
|
if (likely(ieee->raw_tx == 0)){
|
|
|
|
|
|
if (unlikely(skb->len < SNAP_SIZE + sizeof(u16))) {
|
|
|
- printk(KERN_WARNING "%s: skb too small (%d).\n",
|
|
|
- ieee->dev->name, skb->len);
|
|
|
+ netdev_warn(ieee->dev, "skb too small (%d).\n", skb->len);
|
|
|
goto success;
|
|
|
}
|
|
|
|
|
@@ -475,8 +473,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb,
|
|
|
*/
|
|
|
txb = ieee80211_alloc_txb(nr_frags, frag_size, GFP_ATOMIC);
|
|
|
if (unlikely(!txb)) {
|
|
|
- printk(KERN_WARNING "%s: Could not allocate TXB\n",
|
|
|
- ieee->dev->name);
|
|
|
+ netdev_warn(ieee->dev, "Could not allocate TXB\n");
|
|
|
goto failed;
|
|
|
}
|
|
|
txb->encrypted = encrypt;
|
|
@@ -555,15 +552,13 @@ int ieee80211_rtl_xmit(struct sk_buff *skb,
|
|
|
}
|
|
|
} else {
|
|
|
if (unlikely(skb->len < sizeof(struct ieee80211_hdr_3addr))) {
|
|
|
- printk(KERN_WARNING "%s: skb too small (%d).\n",
|
|
|
- ieee->dev->name, skb->len);
|
|
|
+ netdev_warn(ieee->dev, "skb too small (%d).\n", skb->len);
|
|
|
goto success;
|
|
|
}
|
|
|
|
|
|
txb = ieee80211_alloc_txb(1, skb->len, GFP_ATOMIC);
|
|
|
if (!txb) {
|
|
|
- printk(KERN_WARNING "%s: Could not allocate TXB\n",
|
|
|
- ieee->dev->name);
|
|
|
+ netdev_warn(ieee->dev, "Could not allocate TXB\n");
|
|
|
goto failed;
|
|
|
}
|
|
|
|