openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices 

This patch uses SET_NETDEV_DEV to set up a 'device' parent link in sysfs
(e.g. /sys/class/net/wm0/device) for a gdm72xx device.

Signed-off-by: Paul Stewart <pstew@chromium.org>
Signed-off-by: Ben Chan <benchan@chromium.org>
Cc: Sage Ahn <syahn@gctsemi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paul Stewart 2012-05-17 11:15:10 -07:00 committed by Greg Kroah-Hartman
parent 3080b83815
commit 54bc1ff1da
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/gdm72xx/gdm_sdio.c
View File

@ -618,7 +618,7 @@ static void gdm_sdio_irq(struct sdio_func *func)
done: done:
sdio_writeb(func, 0x00, 0x10, &ret); /* PCRRT */ sdio_writeb(func, 0x00, 0x10, &ret); /* PCRRT */
if (!phy_dev->netdev) if (!phy_dev->netdev)
register_wimax_device(phy_dev); register_wimax_device(phy_dev, &func->dev);
} }
static int gdm_sdio_receive(void *priv_dev, static int gdm_sdio_receive(void *priv_dev,

2
drivers/staging/gdm72xx/gdm_usb.c
View File

@ -624,7 +624,7 @@ static int gdm_usb_probe(struct usb_interface *intf,
INIT_WORK(&udev->pm_ws, do_pm_control); INIT_WORK(&udev->pm_ws, do_pm_control);
#endif /* CONFIG_WIMAX_GDM72XX_USB_PM */ #endif /* CONFIG_WIMAX_GDM72XX_USB_PM */
ret = register_wimax_device(phy_dev); ret = register_wimax_device(phy_dev, &intf->dev);
out: out:
if (ret) { if (ret) {

3
drivers/staging/gdm72xx/gdm_wimax.c
View File

@ -943,7 +943,7 @@ static struct net_device_ops gdm_netdev_ops = {
.ndo_do_ioctl = gdm_wimax_ioctl, .ndo_do_ioctl = gdm_wimax_ioctl,
}; };
int register_wimax_device(struct phy_dev *phy_dev) int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev)
{ {
struct nic *nic = NULL; struct nic *nic = NULL;
struct net_device *dev; struct net_device *dev;
@ -957,6 +957,7 @@ int register_wimax_device(struct phy_dev *phy_dev)
return -ENOMEM; return -ENOMEM;
} }
SET_NETDEV_DEV(dev, pdev);
dev->mtu = 1400; dev->mtu = 1400;
dev->netdev_ops = &gdm_netdev_ops; dev->netdev_ops = &gdm_netdev_ops;
dev->flags &= ~IFF_MULTICAST; dev->flags &= ~IFF_MULTICAST;

2
drivers/staging/gdm72xx/gdm_wimax.h
View File

@ -85,7 +85,7 @@ struct nic {
/*#define LOOPBACK_TEST */ /*#define LOOPBACK_TEST */
extern int register_wimax_device(struct phy_dev *phy_dev); extern int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev);
extern int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev); extern int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev);
extern void unregister_wimax_device(struct phy_dev *phy_dev); extern void unregister_wimax_device(struct phy_dev *phy_dev);