3 files changed, 19 insertions, 27 deletions

diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h
index d20f8a40f36e..0d9e506f5d5a 100644
--- a/net/bluetooth/bnep/bnep.h
+++ b/net/bluetooth/bnep/bnep.h
@@ -165,7 +165,6 @@ struct bnep_session {
 
         struct socket    *sock;
         struct net_device *dev;
-        struct net_device_stats stats;
 };
 
 void bnep_net_setup(struct net_device *dev);
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 70fea8bdb4e5..52a6ce0d772b 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -306,7 +306,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
         struct sk_buff *nskb;
         u8 type;
 
-        s->stats.rx_bytes += skb->len;
+        dev->stats.rx_bytes += skb->len;
 
         type = *(u8 *) skb->data; skb_pull(skb, 1);
 
@@ -343,7 +343,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
          * may not be modified and because of the alignment requirements. */
         nskb = alloc_skb(2 + ETH_HLEN + skb->len, GFP_KERNEL);
         if (!nskb) {
-                s->stats.rx_dropped++;
+                dev->stats.rx_dropped++;
                 kfree_skb(skb);
                 return -ENOMEM;
         }
@@ -378,14 +378,14 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
         skb_copy_from_linear_data(skb, __skb_put(nskb, skb->len), skb->len);
         kfree_skb(skb);
 
-        s->stats.rx_packets++;
+        dev->stats.rx_packets++;
         nskb->ip_summed = CHECKSUM_NONE;
         nskb->protocol  = eth_type_trans(nskb, dev);
         netif_rx_ni(nskb);
         return 0;
 
 badframe:
-        s->stats.rx_errors++;
+        dev->stats.rx_errors++;
         kfree_skb(skb);
         return 0;
 }
@@ -448,8 +448,8 @@ send:
         kfree_skb(skb);
 
         if (len > 0) {
-                s->stats.tx_bytes += len;
-                s->stats.tx_packets++;
+                s->dev->stats.tx_bytes += len;
+                s->dev->stats.tx_packets++;
                 return 0;
         }
 
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index f897da6e0444..d7a0e9722def 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -55,12 +55,6 @@ static int bnep_net_close(struct net_device *dev)
         return 0;
 }
 
-static struct net_device_stats *bnep_net_get_stats(struct net_device *dev)
-{
-        struct bnep_session *s = netdev_priv(dev);
-        return &s->stats;
-}
-
 static void bnep_net_set_mc_list(struct net_device *dev)
 {
 #ifdef CONFIG_BT_BNEP_MC_FILTER
@@ -128,11 +122,6 @@ static void bnep_net_timeout(struct net_device *dev)
         netif_wake_queue(dev);
 }
 
-static int bnep_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-{
-        return -EINVAL;
-}
-
 #ifdef CONFIG_BT_BNEP_MC_FILTER
 static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s)
 {
@@ -217,6 +206,18 @@ static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)
         return 0;
 }
 
+static const struct net_device_ops bnep_netdev_ops = {
+        .ndo_open            = bnep_net_open,
+        .ndo_stop            = bnep_net_close,
+        .ndo_start_xmit      = bnep_net_xmit,
+        .ndo_validate_addr   = eth_validate_addr,
+        .ndo_set_multicast_list = bnep_net_set_mc_list,
+        .ndo_set_mac_address = bnep_net_set_mac_addr,
+        .ndo_tx_timeout      = bnep_net_timeout,
+        .ndo_change_mtu      = eth_change_mtu,
+
+};
+
 void bnep_net_setup(struct net_device *dev)
 {
 
@@ -224,15 +225,7 @@ void bnep_net_setup(struct net_device *dev)
         dev->addr_len = ETH_ALEN;
 
         ether_setup(dev);
-
-        dev->open            = bnep_net_open;
-        dev->stop            = bnep_net_close;
-        dev->hard_start_xmit = bnep_net_xmit;
-        dev->get_stats       = bnep_net_get_stats;
-        dev->do_ioctl        = bnep_net_ioctl;
-        dev->set_mac_address = bnep_net_set_mac_addr;
-        dev->set_multicast_list = bnep_net_set_mc_list;
+        dev->netdev_ops = &bnep_netdev_ops;
 
         dev->watchdog_timeo  = HZ * 2;
-        dev->tx_timeout      = bnep_net_timeout;
 }