aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibmveth.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ibmveth.c')
-rw-r--r--drivers/net/ibmveth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 4c2e7279ba3..767203d35bc 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -33,7 +33,6 @@
33 - possibly remove procfs support 33 - possibly remove procfs support
34*/ 34*/
35 35
36#include <linux/config.h>
37#include <linux/module.h> 36#include <linux/module.h>
38#include <linux/types.h> 37#include <linux/types.h>
39#include <linux/errno.h> 38#include <linux/errno.h>
@@ -607,7 +606,7 @@ static u32 netdev_get_link(struct net_device *dev) {
607 return 1; 606 return 1;
608} 607}
609 608
610static struct ethtool_ops netdev_ethtool_ops = { 609static const struct ethtool_ops netdev_ethtool_ops = {
611 .get_drvinfo = netdev_get_drvinfo, 610 .get_drvinfo = netdev_get_drvinfo,
612 .get_settings = netdev_get_settings, 611 .get_settings = netdev_get_settings,
613 .get_link = netdev_get_link, 612 .get_link = netdev_get_link,
@@ -703,7 +702,8 @@ static int ibmveth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
703 desc[3].desc, 702 desc[3].desc,
704 desc[4].desc, 703 desc[4].desc,
705 desc[5].desc, 704 desc[5].desc,
706 correlator); 705 correlator,
706 &correlator);
707 } while ((lpar_rc == H_BUSY) && (retry_count--)); 707 } while ((lpar_rc == H_BUSY) && (retry_count--));
708 708
709 if(lpar_rc != H_SUCCESS && lpar_rc != H_DROPPED) { 709 if(lpar_rc != H_SUCCESS && lpar_rc != H_DROPPED) {