diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 13:28:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 13:28:40 +1000 |
| commit | 5b40f022332784f4582c6fa139f799d6f5adb649 (patch) | |
| tree | 450780ad0496574bb379be8e87dc9e33e817a3c1 /drivers/misc | |
| parent | ad9aefeacf7bd2419f6392ca983a38fb44d47ec6 (diff) | |
| parent | e6b92c25d20c64c271ef429bba8febeefb848b5b (diff) | |
Merge remote-tracking branch 'net-next/master'
Conflicts:
net/ipv6/sysctl_net_ipv6.c
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/sgi-xp/xpnet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c index 3fac67a5204c..557f9782c53c 100644 --- a/drivers/misc/sgi-xp/xpnet.c +++ b/drivers/misc/sgi-xp/xpnet.c @@ -544,7 +544,8 @@ xpnet_init(void) * use ether_setup() to init the majority of our device * structure and then override the necessary pieces. */ - xpnet_device = alloc_netdev(0, XPNET_DEVICE_NAME, ether_setup); + xpnet_device = alloc_netdev(0, XPNET_DEVICE_NAME, NET_NAME_UNKNOWN, + ether_setup); if (xpnet_device == NULL) { kfree(xpnet_broadcast_partitions); return -ENOMEM; |