From 76bac45f4406462225e4df9aa87e6b6a4aca5826 Mon Sep 17 00:00:00 2001 From: Rajesh Borundia Date: Fri, 3 Feb 2012 11:35:14 +0000 Subject: [PATCH] --- yaml --- r: 289864 b: refs/heads/master c: b8c30812b479a53b717ad665728df55d30f784d5 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 67a3d5b34e78..3bfcd527dc69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5471aed0259298e4e258b8a9e403ebdf88ebcd56 +refs/heads/master: b8c30812b479a53b717ad665728df55d30f784d5 diff --git a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index f517c16bfa3f..8dc4a134dece 100644 --- a/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -2930,13 +2930,12 @@ static struct bin_attribute bin_attr_mem = { static void netxen_create_sysfs_entries(struct netxen_adapter *adapter) { - struct net_device *netdev = adapter->netdev; - struct device *dev = &netdev->dev; + struct device *dev = &adapter->pdev->dev; if (adapter->capabilities & NX_FW_CAPABILITY_BDG) { /* bridged_mode control */ if (device_create_file(dev, &dev_attr_bridged_mode)) { - dev_warn(&netdev->dev, + dev_warn(dev, "failed to create bridged_mode sysfs entry\n"); } } @@ -2945,8 +2944,7 @@ netxen_create_sysfs_entries(struct netxen_adapter *adapter) static void netxen_remove_sysfs_entries(struct netxen_adapter *adapter) { - struct net_device *netdev = adapter->netdev; - struct device *dev = &netdev->dev; + struct device *dev = &adapter->pdev->dev; if (adapter->capabilities & NX_FW_CAPABILITY_BDG) device_remove_file(dev, &dev_attr_bridged_mode);