cdc-phonet: autoconfigure Phonet address

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 0ca5916ca8dfa45e6223760a6cad0a13cd03299c..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
 
@@ -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,
 };
 

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index 82b45d16e50cdce64c76b7a699ad30994b553caf..1ef5a07818315b69a4b7b875b198e6c1b1137d24 100644 (file)
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -99,6 +99,9 @@ struct sockaddr_pn {
        __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3];
 } __attribute__ ((packed));
 
+/* Well known address */
+#define PN_DEV_PC      0x10
+
 static inline __u16 pn_object(__u8 addr, __u16 port)
 {
        return (addr << 8) | (port & 0x3ff);