From d21b520fa46e9da4b0e027a3b5526f153a5fbc80 Mon Sep 17 00:00:00 2001 From: "Amit S. Kale" Date: Wed, 29 Nov 2006 08:58:11 -0800 Subject: [PATCH] --- yaml --- r: 41533 b: refs/heads/master c: edf901638144525a140c68be01be1b22e6041a6d h: refs/heads/master i: 41531: c56790152cbb3284ce169c81210af1d314126ff1 v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 886cdba4a0bd..998fd1792c6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38e3a6466f369944a2a1ec9aee9a9e472689d0a9 +refs/heads/master: edf901638144525a140c68be01be1b22e6041a6d diff --git a/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index 145bf47f0a8d..ffd272c93a6b 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/drivers/net/netxen/netxen_nic_main.c @@ -273,6 +273,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } SET_MODULE_OWNER(netdev); + SET_NETDEV_DEV(netdev, &pdev->dev); port = netdev_priv(netdev); port->netdev = netdev; @@ -1043,7 +1044,7 @@ static int netxen_nic_poll(struct net_device *netdev, int *budget) netxen_nic_enable_int(adapter); } - return (done ? 0 : 1); + return !done; } #ifdef CONFIG_NET_POLL_CONTROLLER