diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/8390.c | 2 | ||||
-rw-r--r-- | drivers/net/bnx2.c | 6 | ||||
-rw-r--r-- | drivers/net/xen-netfront.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c index a499e867f0f4..dc5d2584bd0c 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c | |||
@@ -34,7 +34,7 @@ struct net_device *__alloc_ei_netdev(int size) | |||
34 | 34 | ||
35 | void NS8390_init(struct net_device *dev, int startp) | 35 | void NS8390_init(struct net_device *dev, int startp) |
36 | { | 36 | { |
37 | return __NS8390_init(dev, startp); | 37 | __NS8390_init(dev, startp); |
38 | } | 38 | } |
39 | 39 | ||
40 | EXPORT_SYMBOL(ei_open); | 40 | EXPORT_SYMBOL(ei_open); |
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 15853be4680a..861387928e6d 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -1631,8 +1631,10 @@ bnx2_set_default_remote_link(struct bnx2 *bp) | |||
1631 | static void | 1631 | static void |
1632 | bnx2_set_default_link(struct bnx2 *bp) | 1632 | bnx2_set_default_link(struct bnx2 *bp) |
1633 | { | 1633 | { |
1634 | if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP) | 1634 | if (bp->phy_flags & BNX2_PHY_FLAG_REMOTE_PHY_CAP) { |
1635 | return bnx2_set_default_remote_link(bp); | 1635 | bnx2_set_default_remote_link(bp); |
1636 | return; | ||
1637 | } | ||
1636 | 1638 | ||
1637 | bp->autoneg = AUTONEG_SPEED | AUTONEG_FLOW_CTRL; | 1639 | bp->autoneg = AUTONEG_SPEED | AUTONEG_FLOW_CTRL; |
1638 | bp->req_line_speed = 0; | 1640 | bp->req_line_speed = 0; |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index e62018a36133..8bddff150c70 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
@@ -1803,7 +1803,7 @@ static void __exit netif_exit(void) | |||
1803 | if (is_initial_xendomain()) | 1803 | if (is_initial_xendomain()) |
1804 | return; | 1804 | return; |
1805 | 1805 | ||
1806 | return xenbus_unregister_driver(&netfront); | 1806 | xenbus_unregister_driver(&netfront); |
1807 | } | 1807 | } |
1808 | module_exit(netif_exit); | 1808 | module_exit(netif_exit); |
1809 | 1809 | ||