2 files changed, 18 insertions, 10 deletions

diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index d8fc9b32fe36..c0916c7b217e 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -279,6 +279,13 @@ static int pn_net_mtu(struct net_device *dev, int new_mtu)
         return err;
 }
 
+static const struct net_device_ops pn_netdev_ops = {
+        .ndo_open       = pn_net_open,
+        .ndo_stop       = pn_net_close,
+        .ndo_start_xmit = pn_net_xmit,
+        .ndo_change_mtu = pn_net_mtu,
+};
+
 static void pn_net_setup(struct net_device *dev)
 {
         dev->features           = 0;
@@ -290,12 +297,9 @@ static void pn_net_setup(struct net_device *dev)
         dev->addr_len           = 1;
         dev->tx_queue_len       = 1;
 
+        dev->netdev_ops         = &pn_netdev_ops;
         dev->destructor         = free_netdev;
         dev->header_ops         = &phonet_header_ops;
-        dev->open               = pn_net_open;
-        dev->stop               = pn_net_close;
-        dev->hard_start_xmit    = pn_net_xmit; /* mandatory */
-        dev->change_mtu         = pn_net_mtu;
 }
 
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index d9739d52f8f5..96d65ca06ecd 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -716,6 +716,14 @@ static int __init get_ether_addr(const char *str, u8 *dev_addr)
 
 static struct eth_dev *the_dev;
 
+static const struct net_device_ops eth_netdev_ops = {
+        .ndo_open               = eth_open,
+        .ndo_stop               = eth_stop,
+        .ndo_start_xmit         = eth_start_xmit,
+        .ndo_change_mtu         = ueth_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+};
 
 /**
  * gether_setup - initialize one ethernet-over-usb link
@@ -764,12 +772,8 @@ int __init gether_setup(struct usb_gadget *g, u8 ethaddr[ETH_ALEN])
         if (ethaddr)
                 memcpy(ethaddr, dev->host_mac, ETH_ALEN);
 
-        net->change_mtu = ueth_change_mtu;
-        net->hard_start_xmit = eth_start_xmit;
-        net->open = eth_open;
-        net->stop = eth_stop;
-        /* watchdog_timeo, tx_timeout ... */
-        /* set_multicast_list */
+        net->netdev_ops = &eth_netdev_ops;
+
         SET_ETHTOOL_OPS(net, &ops);
 
         /* two kinds of host-initiated state changes: