net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared

[deliverable/linux.git] / drivers / net / wan / hdlc_fr.c

diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index fc433f28c047cf77e15c9fc19010d2e94e74a57a..eb2028187fbe1a5e7de31f862bd908d45fcd82e8 100644 (file)
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -446,15 +446,14 @@ static netdev_tx_t pvc_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static inline void fr_log_dlci_active(pvc_device *pvc)
 {
-       printk(KERN_INFO "%s: DLCI %d [%s%s%s]%s %s\n",
-              pvc->frad->name,
-              pvc->dlci,
-              pvc->main ? pvc->main->name : "",
-              pvc->main && pvc->ether ? " " : "",
-              pvc->ether ? pvc->ether->name : "",
-              pvc->state.new ? " new" : "",
-              !pvc->state.exist ? "deleted" :
-              pvc->state.active ? "active" : "inactive");
+       netdev_info(pvc->frad, "DLCI %d [%s%s%s]%s %s\n",
+                   pvc->dlci,
+                   pvc->main ? pvc->main->name : "",
+                   pvc->main && pvc->ether ? " " : "",
+                   pvc->ether ? pvc->ether->name : "",
+                   pvc->state.new ? " new" : "",
+                   !pvc->state.exist ? "deleted" :
+                   pvc->state.active ? "active" : "inactive");
 }
 
 
@@ -481,16 +480,14 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
        if (dce && fullrep) {
                len += state(hdlc)->dce_pvc_count * (2 + stat_len);
                if (len > HDLC_MAX_MRU) {
-                       printk(KERN_WARNING "%s: Too many PVCs while sending "
-                              "LMI full report\n", dev->name);
+                       netdev_warn(dev, "Too many PVCs while sending LMI full report\n");
                        return;
                }
        }
 
        skb = dev_alloc_skb(len);
        if (!skb) {
-               printk(KERN_WARNING "%s: Memory squeeze on fr_lmi_send()\n",
-                      dev->name);
+               netdev_warn(dev, "Memory squeeze on fr_lmi_send()\n");
                return;
        }
        memset(skb->data, 0, len);
@@ -615,8 +612,7 @@ static void fr_timer(unsigned long arg)
                state(hdlc)->last_errors <<= 1; /* Shift the list */
                if (state(hdlc)->request) {
                        if (state(hdlc)->reliable)
-                               printk(KERN_INFO "%s: No LMI status reply "
-                                      "received\n", dev->name);
+                               netdev_info(dev, "No LMI status reply received\n");
                        state(hdlc)->last_errors |= 1;
                }
 
@@ -628,8 +624,7 @@ static void fr_timer(unsigned long arg)
        }
 
        if (state(hdlc)->reliable != reliable) {
-               printk(KERN_INFO "%s: Link %sreliable\n", dev->name,
-                      reliable ? "" : "un");
+               netdev_info(dev, "Link %sreliable\n", reliable ? "" : "un");
                fr_set_link_state(reliable, dev);
        }
 
@@ -665,33 +660,32 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
 
        if (skb->len < (lmi == LMI_ANSI ? LMI_ANSI_LENGTH :
                        LMI_CCITT_CISCO_LENGTH)) {
-               printk(KERN_INFO "%s: Short LMI frame\n", dev->name);
+               netdev_info(dev, "Short LMI frame\n");
                return 1;
        }
 
        if (skb->data[3] != (lmi == LMI_CISCO ? NLPID_CISCO_LMI :
                             NLPID_CCITT_ANSI_LMI)) {
-               printk(KERN_INFO "%s: Received non-LMI frame with LMI DLCI\n",
-                      dev->name);
+               netdev_info(dev, "Received non-LMI frame with LMI DLCI\n");
                return 1;
        }
 
        if (skb->data[4] != LMI_CALLREF) {
-               printk(KERN_INFO "%s: Invalid LMI Call reference (0x%02X)\n",
-                      dev->name, skb->data[4]);
+               netdev_info(dev, "Invalid LMI Call reference (0x%02X)\n",
+                           skb->data[4]);
                return 1;
        }
 
        if (skb->data[5] != (dce ? LMI_STATUS_ENQUIRY : LMI_STATUS)) {
-               printk(KERN_INFO "%s: Invalid LMI Message type (0x%02X)\n",
-                      dev->name, skb->data[5]);
+               netdev_info(dev, "Invalid LMI Message type (0x%02X)\n",
+                           skb->data[5]);
                return 1;
        }
 
        if (lmi == LMI_ANSI) {
                if (skb->data[6] != LMI_ANSI_LOCKSHIFT) {
-                       printk(KERN_INFO "%s: Not ANSI locking shift in LMI"
-                              " message (0x%02X)\n", dev->name, skb->data[6]);
+                       netdev_info(dev, "Not ANSI locking shift in LMI message (0x%02X)\n",
+                                   skb->data[6]);
                        return 1;
                }
                i = 7;
@@ -700,34 +694,34 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
 
        if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_REPTYPE :
                             LMI_ANSI_CISCO_REPTYPE)) {
-               printk(KERN_INFO "%s: Not an LMI Report type IE (0x%02X)\n",
-                      dev->name, skb->data[i]);
+               netdev_info(dev, "Not an LMI Report type IE (0x%02X)\n",
+                           skb->data[i]);
                return 1;
        }
 
        if (skb->data[++i] != LMI_REPT_LEN) {
-               printk(KERN_INFO "%s: Invalid LMI Report type IE length"
-                      " (%u)\n", dev->name, skb->data[i]);
+               netdev_info(dev, "Invalid LMI Report type IE length (%u)\n",
+                           skb->data[i]);
                return 1;
        }
 
        reptype = skb->data[++i];
        if (reptype != LMI_INTEGRITY && reptype != LMI_FULLREP) {
-               printk(KERN_INFO "%s: Unsupported LMI Report type (0x%02X)\n",
-                      dev->name, reptype);
+               netdev_info(dev, "Unsupported LMI Report type (0x%02X)\n",
+                           reptype);
                return 1;
        }
 
        if (skb->data[++i] != (lmi == LMI_CCITT ? LMI_CCITT_ALIVE :
                               LMI_ANSI_CISCO_ALIVE)) {
-               printk(KERN_INFO "%s: Not an LMI Link integrity verification"
-                      " IE (0x%02X)\n", dev->name, skb->data[i]);
+               netdev_info(dev, "Not an LMI Link integrity verification IE (0x%02X)\n",
+                           skb->data[i]);
                return 1;
        }
 
        if (skb->data[++i] != LMI_INTEG_LEN) {
-               printk(KERN_INFO "%s: Invalid LMI Link integrity verification"
-                      " IE length (%u)\n", dev->name, skb->data[i]);
+               netdev_info(dev, "Invalid LMI Link integrity verification IE length (%u)\n",
+                           skb->data[i]);
                return 1;
        }
        i++;
@@ -801,14 +795,14 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
 
                if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_PVCSTAT :
                                       LMI_ANSI_CISCO_PVCSTAT)) {
-                       printk(KERN_INFO "%s: Not an LMI PVC status IE"
-                              " (0x%02X)\n", dev->name, skb->data[i]);
+                       netdev_info(dev, "Not an LMI PVC status IE (0x%02X)\n",
+                                   skb->data[i]);
                        return 1;
                }
 
                if (skb->data[++i] != stat_len) {
-                       printk(KERN_INFO "%s: Invalid LMI PVC status IE length"
-                              " (%u)\n", dev->name, skb->data[i]);
+                       netdev_info(dev, "Invalid LMI PVC status IE length (%u)\n",
+                                   skb->data[i]);
                        return 1;
                }
                i++;
@@ -829,9 +823,7 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
                pvc = add_pvc(dev, dlci);
 
                if (!pvc && !no_ram) {
-                       printk(KERN_WARNING
-                              "%s: Memory squeeze on fr_lmi_recv()\n",
-                              dev->name);
+                       netdev_warn(dev, "Memory squeeze on fr_lmi_recv()\n");
                        no_ram = 1;
                }
 
@@ -902,8 +894,8 @@ static int fr_rx(struct sk_buff *skb)
        pvc = find_pvc(hdlc, dlci);
        if (!pvc) {
 #ifdef DEBUG_PKT
-               printk(KERN_INFO "%s: No PVC for received frame's DLCI %d\n",
-                      frad->name, dlci);
+               netdev_info(frad, "No PVC for received frame's DLCI %d\n",
+                           dlci);
 #endif
                dev_kfree_skb_any(skb);
                return NET_RX_DROP;
@@ -962,14 +954,14 @@ static int fr_rx(struct sk_buff *skb)
                        break;
 
                default:
-                       printk(KERN_INFO "%s: Unsupported protocol, OUI=%x "
-                              "PID=%x\n", frad->name, oui, pid);
+                       netdev_info(frad, "Unsupported protocol, OUI=%x PID=%x\n",
+                                   oui, pid);
                        dev_kfree_skb_any(skb);
                        return NET_RX_DROP;
                }
        } else {
-               printk(KERN_INFO "%s: Unsupported protocol, NLPID=%x "
-                      "length = %i\n", frad->name, data[3], skb->len);
+               netdev_info(frad, "Unsupported protocol, NLPID=%x length=%i\n",
+                           data[3], skb->len);
                dev_kfree_skb_any(skb);
                return NET_RX_DROP;
        }
@@ -1073,8 +1065,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
        int used;
 
        if ((pvc = add_pvc(frad, dlci)) == NULL) {
-               printk(KERN_WARNING "%s: Memory squeeze on fr_add_pvc()\n",
-                      frad->name);
+               netdev_warn(frad, "Memory squeeze on fr_add_pvc()\n");
                return -ENOBUFS;
        }
 
@@ -1083,14 +1074,14 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
 
        used = pvc_is_used(pvc);
 
-       if (type == ARPHRD_ETHER)
+       if (type == ARPHRD_ETHER) {
                dev = alloc_netdev(0, "pvceth%d", ether_setup);
-       else
+               dev->priv_flags &= ~IFF_TX_SKB_SHARING;
+       } else
                dev = alloc_netdev(0, "pvc%d", pvc_setup);
 
        if (!dev) {
-               printk(KERN_WARNING "%s: Memory squeeze on fr_pvc()\n",
-                      frad->name);
+               netdev_warn(frad, "Memory squeeze on fr_pvc()\n");
                delete_unused_pvcs(hdlc);
                return -ENOBUFS;
        }