diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-30 09:56:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-30 09:56:54 -0700 |
| commit | 65d04adea25d2976609c828439dc7af9664ecdf1 (patch) | |
| tree | 60bb14804f5fbbdb34ac69ca282ddee9dcc9e8fb /network-class_device-to-device.patch | |
| parent | 79fb1c201c3f0925d6f12c71ab4bbbe5c3bc72e4 (diff) | |
| download | patches-65d04adea25d2976609c828439dc7af9664ecdf1.tar.gz | |
devfs removal patches finally got merged!!!
Diffstat (limited to 'network-class_device-to-device.patch')
| -rw-r--r-- | network-class_device-to-device.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/network-class_device-to-device.patch b/network-class_device-to-device.patch index edc36e9421f049..d23bfadafd1303 100644 --- a/network-class_device-to-device.patch +++ b/network-class_device-to-device.patch @@ -870,7 +870,7 @@ --- gregkh-2.6.orig/include/linux/netdevice.h +++ gregkh-2.6/include/linux/netdevice.h -@@ -515,10 +515,11 @@ struct net_device +@@ -517,10 +517,11 @@ struct net_device #endif /* CONFIG_NET_DIVERT */ /* class/net/name entry */ @@ -883,7 +883,7 @@ #define NETDEV_ALIGN 32 #define NETDEV_ALIGN_CONST (NETDEV_ALIGN - 1) -@@ -534,7 +535,7 @@ static inline void *netdev_priv(struct n +@@ -536,7 +537,7 @@ static inline void *netdev_priv(struct n /* Set the sysfs physical device reference for the network logical device * if set prior to registration will cause a symlink during initialization. */ @@ -1335,7 +1335,7 @@ if (!err) { hlist_del(&dev->name_hlist); hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name)); -@@ -3211,8 +3211,8 @@ void free_netdev(struct net_device *dev) +@@ -3224,8 +3224,8 @@ void free_netdev(struct net_device *dev) BUG_ON(dev->reg_state != NETREG_UNREGISTERED); dev->reg_state = NETREG_RELEASED; |