diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-03 11:09:09 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-03 11:09:09 -0700 |
commit | edebd83392a7b67e4b4aa1a3d387f0593d07f053 (patch) | |
tree | 15ba4110301eff54b33437e6dad58d2d71e632f6 /network-class_device-to-device.patch | |
parent | 4f380d9c1d1c3e77a996c2dfaa09daebdce6b257 (diff) | |
download | patches-edebd83392a7b67e4b4aa1a3d387f0593d07f053.tar.gz |
2.6.17-git21 refresh
Diffstat (limited to 'network-class_device-to-device.patch')
-rw-r--r-- | network-class_device-to-device.patch | 126 |
1 files changed, 63 insertions, 63 deletions
diff --git a/network-class_device-to-device.patch b/network-class_device-to-device.patch index 375fb1480500e..5a04ed9b50b50 100644 --- a/network-class_device-to-device.patch +++ b/network-class_device-to-device.patch @@ -128,7 +128,7 @@ list_add_tail(&priv->list, &ppriv->child_intfs); --- gregkh-2.6.orig/drivers/net/bonding/bond_sysfs.c +++ gregkh-2.6/drivers/net/bonding/bond_sysfs.c -@@ -40,8 +40,7 @@ +@@ -39,8 +39,7 @@ /* #define BONDING_DEBUG 1 */ #include "bonding.h" @@ -138,7 +138,7 @@ #define to_bond(cd) ((struct bonding *)(to_net_dev(cd)->priv)) /*---------------------------- Declarations -------------------------------*/ -@@ -154,7 +153,7 @@ static ssize_t bonding_store_bonds(struc +@@ -153,7 +152,7 @@ static ssize_t bonding_store_bonds(struc * If it's > expected, then there's a file open, * and we have to fail. */ @@ -147,7 +147,7 @@ > expected_refcount){ rtnl_unlock(); printk(KERN_INFO DRV_NAME -@@ -201,13 +200,13 @@ int bond_create_slave_symlinks(struct ne +@@ -200,13 +199,13 @@ int bond_create_slave_symlinks(struct ne int ret = 0; /* first, create a link from the slave back to the master */ @@ -163,7 +163,7 @@ linkname); return ret; -@@ -217,20 +216,21 @@ void bond_destroy_slave_symlinks(struct +@@ -216,20 +215,21 @@ void bond_destroy_slave_symlinks(struct { char linkname[IFNAMSIZ+7]; @@ -189,7 +189,7 @@ read_lock_bh(&bond->lock); bond_for_each_slave(bond, slave, i) { -@@ -254,14 +254,16 @@ static ssize_t bonding_show_slaves(struc +@@ -253,14 +253,16 @@ static ssize_t bonding_show_slaves(struc * up for this to succeed. * This function is largely the same flow as bonding_update_bonds(). */ @@ -208,7 +208,7 @@ /* Quick sanity check -- is the bond interface up? */ if (!(bond->dev->flags & IFF_UP)) { -@@ -387,25 +389,28 @@ out: +@@ -386,25 +388,28 @@ out: return ret; } @@ -242,7 +242,7 @@ if (bond->dev->flags & IFF_UP) { printk(KERN_ERR DRV_NAME -@@ -438,16 +443,18 @@ static ssize_t bonding_store_mode(struct +@@ -437,16 +442,18 @@ static ssize_t bonding_store_mode(struct out: return ret; } @@ -264,7 +264,7 @@ if ((bond->params.mode != BOND_MODE_XOR) && (bond->params.mode != BOND_MODE_8023AD)) { -@@ -462,10 +469,12 @@ static ssize_t bonding_show_xmit_hash(st +@@ -461,10 +468,12 @@ static ssize_t bonding_show_xmit_hash(st return count; } @@ -279,7 +279,7 @@ if (bond->dev->flags & IFF_UP) { printk(KERN_ERR DRV_NAME -@@ -501,7 +510,7 @@ static ssize_t bonding_store_xmit_hash(s +@@ -500,7 +509,7 @@ static ssize_t bonding_store_xmit_hash(s out: return ret; } @@ -288,7 +288,7 @@ /* * Show and set the arp timer interval. There are two tricky bits -@@ -509,17 +518,21 @@ static CLASS_DEVICE_ATTR(xmit_hash_polic +@@ -508,17 +517,21 @@ static CLASS_DEVICE_ATTR(xmit_hash_polic * MII monitoring. Second, if the ARP timer isn't running, we must * start it. */ @@ -314,7 +314,7 @@ if (sscanf(buf, "%d", &new_value) != 1) { printk(KERN_ERR DRV_NAME -@@ -591,15 +604,17 @@ static ssize_t bonding_store_arp_interva +@@ -590,15 +603,17 @@ static ssize_t bonding_store_arp_interva out: return ret; } @@ -335,7 +335,7 @@ for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) { if (bond->params.arp_targets[i]) -@@ -613,11 +628,13 @@ static ssize_t bonding_show_arp_targets( +@@ -612,11 +627,13 @@ static ssize_t bonding_show_arp_targets( return res; } @@ -351,7 +351,7 @@ u32 *targets; targets = bond->params.arp_targets; -@@ -695,24 +712,28 @@ static ssize_t bonding_store_arp_targets +@@ -694,24 +711,28 @@ static ssize_t bonding_store_arp_targets out: return ret; } @@ -385,7 +385,7 @@ if (!(bond->params.miimon)) { printk(KERN_ERR DRV_NAME -@@ -753,20 +774,24 @@ static ssize_t bonding_store_downdelay(s +@@ -752,20 +773,24 @@ static ssize_t bonding_store_downdelay(s out: return ret; } @@ -415,7 +415,7 @@ if (!(bond->params.miimon)) { printk(KERN_ERR DRV_NAME -@@ -807,25 +832,29 @@ static ssize_t bonding_store_updelay(str +@@ -806,25 +831,29 @@ static ssize_t bonding_store_updelay(str out: return ret; } @@ -450,7 +450,7 @@ if (bond->dev->flags & IFF_UP) { printk(KERN_ERR DRV_NAME -@@ -859,7 +888,7 @@ static ssize_t bonding_store_lacp(struct +@@ -858,7 +887,7 @@ static ssize_t bonding_store_lacp(struct out: return ret; } @@ -459,7 +459,7 @@ /* * Show and set the MII monitor interval. There are two tricky bits -@@ -867,17 +896,21 @@ static CLASS_DEVICE_ATTR(lacp_rate, S_IR +@@ -866,17 +895,21 @@ static CLASS_DEVICE_ATTR(lacp_rate, S_IR * ARP monitoring. Second, if the timer isn't running, we must * start it. */ @@ -485,7 +485,7 @@ if (sscanf(buf, "%d", &new_value) != 1) { printk(KERN_ERR DRV_NAME -@@ -948,7 +981,7 @@ static ssize_t bonding_store_miimon(stru +@@ -947,7 +980,7 @@ static ssize_t bonding_store_miimon(stru out: return ret; } @@ -494,7 +494,7 @@ /* * Show and set the primary slave. The store function is much -@@ -957,10 +990,12 @@ static CLASS_DEVICE_ATTR(miimon, S_IRUGO +@@ -956,10 +989,12 @@ static CLASS_DEVICE_ATTR(miimon, S_IRUGO * The bond must be a mode that supports a primary for this be * set. */ @@ -509,7 +509,7 @@ if (bond->primary_slave) count = sprintf(buf, "%s\n", bond->primary_slave->dev->name) + 1; -@@ -970,11 +1005,13 @@ static ssize_t bonding_show_primary(stru +@@ -969,11 +1004,13 @@ static ssize_t bonding_show_primary(stru return count; } @@ -525,7 +525,7 @@ write_lock_bh(&bond->lock); if (!USES_PRIMARY(bond->params.mode)) { -@@ -1013,22 +1050,26 @@ out: +@@ -1012,22 +1049,26 @@ out: write_unlock_bh(&bond->lock); return count; } @@ -557,7 +557,7 @@ if (sscanf(buf, "%d", &new_value) != 1) { -@@ -1050,16 +1091,18 @@ static ssize_t bonding_store_carrier(str +@@ -1049,16 +1090,18 @@ static ssize_t bonding_store_carrier(str out: return count; } @@ -579,7 +579,7 @@ int count; -@@ -1074,13 +1117,15 @@ static ssize_t bonding_show_active_slave +@@ -1073,13 +1116,15 @@ static ssize_t bonding_show_active_slave return count; } @@ -597,7 +597,7 @@ write_lock_bh(&bond->lock); if (!USES_PRIMARY(bond->params.mode)) { -@@ -1142,16 +1187,18 @@ out: +@@ -1141,16 +1186,18 @@ out: return count; } @@ -619,7 +619,7 @@ read_lock(&bond->curr_slave_lock); curr = bond->curr_active_slave; -@@ -1159,16 +1206,18 @@ static ssize_t bonding_show_mii_status(s +@@ -1158,16 +1205,18 @@ static ssize_t bonding_show_mii_status(s return sprintf(buf, "%s\n", (curr) ? "up" : "down") + 1; } @@ -641,7 +641,7 @@ if (bond->params.mode == BOND_MODE_8023AD) { struct ad_info ad_info; -@@ -1179,16 +1228,18 @@ static ssize_t bonding_show_ad_aggregato +@@ -1178,16 +1227,18 @@ static ssize_t bonding_show_ad_aggregato return count; } @@ -663,7 +663,7 @@ if (bond->params.mode == BOND_MODE_8023AD) { struct ad_info ad_info; -@@ -1199,16 +1250,18 @@ static ssize_t bonding_show_ad_num_ports +@@ -1198,16 +1249,18 @@ static ssize_t bonding_show_ad_num_ports return count; } @@ -685,7 +685,7 @@ if (bond->params.mode == BOND_MODE_8023AD) { struct ad_info ad_info; -@@ -1219,16 +1272,18 @@ static ssize_t bonding_show_ad_actor_key +@@ -1218,16 +1271,18 @@ static ssize_t bonding_show_ad_actor_key return count; } @@ -707,7 +707,7 @@ if (bond->params.mode == BOND_MODE_8023AD) { struct ad_info ad_info; -@@ -1239,16 +1294,18 @@ static ssize_t bonding_show_ad_partner_k +@@ -1238,16 +1293,18 @@ static ssize_t bonding_show_ad_partner_k return count; } @@ -729,7 +729,7 @@ if (bond->params.mode == BOND_MODE_8023AD) { struct ad_info ad_info; -@@ -1267,29 +1324,29 @@ static ssize_t bonding_show_ad_partner_m +@@ -1266,29 +1323,29 @@ static ssize_t bonding_show_ad_partner_m return count; } @@ -778,7 +778,7 @@ NULL, }; -@@ -1314,7 +1371,7 @@ int bond_create_sysfs(void) +@@ -1313,7 +1370,7 @@ int bond_create_sysfs(void) if (!firstbond) return -ENODEV; @@ -787,7 +787,7 @@ if (!netdev_class) return -ENODEV; -@@ -1342,13 +1399,13 @@ int bond_create_sysfs_entry(struct bondi +@@ -1341,13 +1398,13 @@ int bond_create_sysfs_entry(struct bondi struct net_device *dev = bond->dev; int err; @@ -803,7 +803,7 @@ return err; } -@@ -1359,6 +1416,6 @@ void bond_destroy_sysfs_entry(struct bon +@@ -1358,6 +1415,6 @@ void bond_destroy_sysfs_entry(struct bon { struct net_device *dev = bond->dev; @@ -813,7 +813,7 @@ --- gregkh-2.6.orig/drivers/net/wireless/hostap/hostap_main.c +++ gregkh-2.6/drivers/net/wireless/hostap/hostap_main.c -@@ -85,7 +85,7 @@ struct net_device * hostap_add_interface +@@ -84,7 +84,7 @@ struct net_device * hostap_add_interface if (strchr(dev->name, '%')) ret = dev_alloc_name(dev, dev->name); @@ -824,7 +824,7 @@ --- gregkh-2.6.orig/drivers/net/wireless/orinoco.c +++ gregkh-2.6/drivers/net/wireless/orinoco.c -@@ -4285,8 +4285,8 @@ static void orinoco_get_drvinfo(struct n +@@ -4284,8 +4284,8 @@ static void orinoco_get_drvinfo(struct n strncpy(info->driver, DRIVER_NAME, sizeof(info->driver) - 1); strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1); strncpy(info->fw_version, priv->fw_name, sizeof(info->fw_version) - 1); @@ -837,7 +837,7 @@ snprintf(info->bus_info, sizeof(info->bus_info) - 1, --- gregkh-2.6.orig/drivers/net/wireless/orinoco_cs.c +++ gregkh-2.6/drivers/net/wireless/orinoco_cs.c -@@ -344,7 +344,7 @@ orinoco_cs_config(struct pcmcia_device * +@@ -343,7 +343,7 @@ orinoco_cs_config(struct pcmcia_device * /* Finally, report what we've done */ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " @@ -848,7 +848,7 @@ --- gregkh-2.6.orig/drivers/net/wireless/spectrum_cs.c +++ gregkh-2.6/drivers/net/wireless/spectrum_cs.c -@@ -823,7 +823,7 @@ spectrum_cs_config(struct pcmcia_device +@@ -822,7 +822,7 @@ spectrum_cs_config(struct pcmcia_device /* Finally, report what we've done */ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s, irq %d, io " @@ -859,7 +859,7 @@ --- gregkh-2.6.orig/include/linux/netdevice.h +++ gregkh-2.6/include/linux/netdevice.h -@@ -517,10 +517,11 @@ struct net_device +@@ -519,10 +519,11 @@ struct net_device #endif /* CONFIG_NET_DIVERT */ /* class/net/name entry */ @@ -872,7 +872,7 @@ #define NETDEV_ALIGN 32 #define NETDEV_ALIGN_CONST (NETDEV_ALIGN - 1) -@@ -536,7 +537,7 @@ static inline void *netdev_priv(struct n +@@ -538,7 +539,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. */ @@ -1315,7 +1315,7 @@ goto out2; --- gregkh-2.6.orig/net/core/dev.c +++ gregkh-2.6/net/core/dev.c -@@ -742,7 +742,7 @@ int dev_change_name(struct net_device *d +@@ -741,7 +741,7 @@ int dev_change_name(struct net_device *d else strlcpy(dev->name, newname, IFNAMSIZ); @@ -1324,7 +1324,7 @@ if (!err) { hlist_del(&dev->name_hlist); hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name)); -@@ -3224,8 +3224,8 @@ void free_netdev(struct net_device *dev) +@@ -3223,8 +3223,8 @@ void free_netdev(struct net_device *dev) BUG_ON(dev->reg_state != NETREG_UNREGISTERED); dev->reg_state = NETREG_RELEASED; @@ -1337,7 +1337,7 @@ #endif --- gregkh-2.6.orig/net/core/net-sysfs.c +++ gregkh-2.6/net/core/net-sysfs.c -@@ -19,9 +19,6 @@ +@@ -18,9 +18,6 @@ #include <linux/wireless.h> #include <net/iw_handler.h> @@ -1347,7 +1347,7 @@ static const char fmt_hex[] = "%#x\n"; static const char fmt_long_hex[] = "%#lx\n"; static const char fmt_dec[] = "%d\n"; -@@ -33,10 +30,11 @@ static inline int dev_isalive(const stru +@@ -32,10 +29,11 @@ static inline int dev_isalive(const stru } /* use same locking rules as GIF* ioctl's */ @@ -1361,7 +1361,7 @@ ssize_t ret = -EINVAL; read_lock(&dev_base_lock); -@@ -53,14 +51,15 @@ static ssize_t format_##field(const stru +@@ -52,14 +50,15 @@ static ssize_t format_##field(const stru { \ return sprintf(buf, format_string, net->field); \ } \ @@ -1380,7 +1380,7 @@ const char *buf, size_t len, int (*set)(struct net_device *, unsigned long)) { -@@ -105,7 +104,8 @@ static ssize_t format_addr(char *buf, co +@@ -104,7 +103,8 @@ static ssize_t format_addr(char *buf, co return cp - buf; } @@ -1390,7 +1390,7 @@ { struct net_device *net = to_net_dev(dev); ssize_t ret = -EINVAL; -@@ -117,7 +117,8 @@ static ssize_t show_address(struct class +@@ -116,7 +116,8 @@ static ssize_t show_address(struct class return ret; } @@ -1400,7 +1400,7 @@ { struct net_device *net = to_net_dev(dev); if (dev_isalive(net)) -@@ -125,7 +126,8 @@ static ssize_t show_broadcast(struct cla +@@ -124,7 +125,8 @@ static ssize_t show_broadcast(struct cla return -EINVAL; } @@ -1410,7 +1410,7 @@ { struct net_device *netdev = to_net_dev(dev); if (netif_running(netdev)) { -@@ -134,7 +136,8 @@ static ssize_t show_carrier(struct class +@@ -133,7 +135,8 @@ static ssize_t show_carrier(struct class return -EINVAL; } @@ -1420,7 +1420,7 @@ { struct net_device *netdev = to_net_dev(dev); -@@ -154,7 +157,8 @@ static const char *operstates[] = { +@@ -153,7 +156,8 @@ static const char *operstates[] = { "up" }; @@ -1430,7 +1430,7 @@ { const struct net_device *netdev = to_net_dev(dev); unsigned char operstate; -@@ -179,9 +183,10 @@ static int change_mtu(struct net_device +@@ -178,9 +182,10 @@ static int change_mtu(struct net_device return dev_set_mtu(net, (int) new_mtu); } @@ -1443,7 +1443,7 @@ } NETDEVICE_SHOW(flags, fmt_hex); -@@ -191,9 +196,10 @@ static int change_flags(struct net_devic +@@ -190,9 +195,10 @@ static int change_flags(struct net_devic return dev_change_flags(net, (unsigned) new_flags); } @@ -1456,7 +1456,7 @@ } NETDEVICE_SHOW(tx_queue_len, fmt_ulong); -@@ -204,9 +210,11 @@ static int change_tx_queue_len(struct ne +@@ -203,9 +209,11 @@ static int change_tx_queue_len(struct ne return 0; } @@ -1470,7 +1470,7 @@ } NETDEVICE_SHOW(weight, fmt_dec); -@@ -217,12 +225,13 @@ static int change_weight(struct net_devi +@@ -216,12 +224,13 @@ static int change_weight(struct net_devi return 0; } @@ -1487,7 +1487,7 @@ __ATTR(addr_len, S_IRUGO, show_addr_len, NULL), __ATTR(iflink, S_IRUGO, show_iflink, NULL), __ATTR(ifindex, S_IRUGO, show_ifindex, NULL), -@@ -243,10 +252,11 @@ static struct class_device_attribute net +@@ -242,10 +251,11 @@ static struct class_device_attribute net }; /* Show a given an attribute in the statistics group */ @@ -1501,7 +1501,7 @@ struct net_device_stats *stats; ssize_t ret = -EINVAL; -@@ -266,12 +276,13 @@ static ssize_t netstat_show(const struct +@@ -265,12 +275,13 @@ static ssize_t netstat_show(const struct /* generate a read-only statistics attribute */ #define NETSTAT_ENTRY(name) \ @@ -1518,7 +1518,7 @@ NETSTAT_ENTRY(rx_packets); NETSTAT_ENTRY(tx_packets); -@@ -298,29 +309,29 @@ NETSTAT_ENTRY(rx_compressed); +@@ -297,29 +308,29 @@ NETSTAT_ENTRY(rx_compressed); NETSTAT_ENTRY(tx_compressed); static struct attribute *netstat_attrs[] = { @@ -1571,7 +1571,7 @@ NULL }; -@@ -332,11 +343,11 @@ static struct attribute_group netstat_gr +@@ -331,11 +342,11 @@ static struct attribute_group netstat_gr #ifdef WIRELESS_EXT /* helper function that does all the locking etc for wireless stats */ @@ -1585,7 +1585,7 @@ const struct iw_statistics *iw = NULL; ssize_t ret = -EINVAL; -@@ -361,11 +372,12 @@ static ssize_t format_iw_##name(const st +@@ -360,11 +371,12 @@ static ssize_t format_iw_##name(const st { \ return sprintf(buf, format_string, iw->field); \ } \ @@ -1601,7 +1601,7 @@ WIRELESS_SHOW(status, status, fmt_hex); WIRELESS_SHOW(link, qual.qual, fmt_dec); -@@ -379,16 +391,16 @@ WIRELESS_SHOW(retries, discard.retries, +@@ -378,16 +390,16 @@ WIRELESS_SHOW(retries, discard.retries, WIRELESS_SHOW(beacon, miss.beacon, fmt_dec); static struct attribute *wireless_attrs[] = { @@ -1628,7 +1628,7 @@ NULL }; -@@ -399,10 +411,10 @@ static struct attribute_group wireless_g +@@ -398,10 +410,10 @@ static struct attribute_group wireless_g #endif #ifdef CONFIG_HOTPLUG @@ -1641,7 +1641,7 @@ int i = 0; int n; -@@ -422,12 +434,11 @@ static int netdev_uevent(struct class_de +@@ -421,12 +433,11 @@ static int netdev_uevent(struct class_de /* * netdev_release -- destroy and free a dead device. @@ -1657,7 +1657,7 @@ BUG_ON(dev->reg_state != NETREG_RELEASED); -@@ -436,31 +447,31 @@ static void netdev_release(struct class_ +@@ -435,31 +446,31 @@ static void netdev_release(struct class_ static struct class net_class = { .name = "net", @@ -1699,7 +1699,7 @@ if (net->get_stats) *groups++ = &netstat_group; -@@ -471,7 +482,7 @@ int netdev_register_sysfs(struct net_dev +@@ -470,7 +481,7 @@ int netdev_register_sysfs(struct net_dev *groups++ = &wireless_group; #endif |