cdc-phonet: autoconfigure Phonet address

[karo-tx-linux.git] / drivers / net / usb / cdc-phonet.c

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 792af72da8acbbda3653d4d66d9a5e4251778187..97e54d9d03ce760bea2b7178b646c82a41d87c5c 100644 (file)
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -27,6 +27,7 @@
 #include <linux/netdevice.h>
 #include <linux/if_arp.h>
 #include <linux/if_phonet.h>
+#include <linux/phonet.h>
 
 #define PN_MEDIA_USB   0x1B
 
@@ -55,7 +56,7 @@ static void rx_complete(struct urb *req);
 /*
  * Network device callbacks
  */
-static int usbpn_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t usbpn_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct usbpn_dev *pnd = netdev_priv(dev);
        struct urb *req = NULL;
@@ -82,12 +83,12 @@ static int usbpn_xmit(struct sk_buff *skb, struct net_device *dev)
        if (pnd->tx_queue >= dev->tx_queue_len)
                netif_stop_queue(dev);
        spin_unlock_irqrestore(&pnd->tx_lock, flags);
-       return 0;
+       return NETDEV_TX_OK;
 
 drop:
        dev_kfree_skb(skb);
        dev->stats.tx_dropped++;
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static void tx_complete(struct urb *req)
@@ -256,6 +257,19 @@ static int usbpn_close(struct net_device *dev)
        return usb_set_interface(pnd->usb, num, !pnd->active_setting);
 }
 
+static int usbpn_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+       struct if_phonet_req *req = (struct if_phonet_req *)ifr;
+
+       switch (cmd) {
+       case SIOCPNGAUTOCONF:
+               req->ifr_phonet_autoconf.device = PN_DEV_PC;
+               printk(KERN_CRIT"device is PN_DEV_PC\n");
+               return 0;
+       }
+       return -ENOIOCTLCMD;
+}
+
 static int usbpn_set_mtu(struct net_device *dev, int new_mtu)
 {
        if ((new_mtu < PHONET_MIN_MTU) || (new_mtu > PHONET_MAX_MTU))
@@ -269,6 +283,7 @@ static const struct net_device_ops usbpn_ops = {
        .ndo_open       = usbpn_open,
        .ndo_stop       = usbpn_close,
        .ndo_start_xmit = usbpn_xmit,
+       .ndo_do_ioctl   = usbpn_ioctl,
        .ndo_change_mtu = usbpn_set_mtu,
 };