git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers: replace NIPQUAD()
[safe/jmp/linux-2.6]
/
drivers
/
net
/
bonding
/
bond_sysfs.c
diff --git
a/drivers/net/bonding/bond_sysfs.c
b/drivers/net/bonding/bond_sysfs.c
index
6caac0f
..
296a865
100644
(file)
--- a/
drivers/net/bonding/bond_sysfs.c
+++ b/
drivers/net/bonding/bond_sysfs.c
@@
-350,9
+350,6
@@
static ssize_t bonding_store_slaves(struct device *d,
if (dev) {
printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
bond->dev->name, dev->name);
if (dev) {
printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
bond->dev->name, dev->name);
- if (bond->setup_by_slave)
- res = bond_release_and_destroy(bond->dev, dev);
- else
res = bond_release(bond->dev, dev);
if (res) {
ret = res;
res = bond_release(bond->dev, dev);
if (res) {
ret = res;
@@
-675,8
+672,8
@@
static ssize_t bonding_show_arp_targets(struct device *d,
for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
if (bond->params.arp_targets[i])
for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
if (bond->params.arp_targets[i])
- res += sprintf(buf + res, "%
u.%u.%u.%u
",
-
NIPQUAD(bond->params.arp_targets[i])
);
+ res += sprintf(buf + res, "%
pI4
",
+
&bond->params.arp_targets[i]
);
}
if (res)
buf[res-1] = '\n'; /* eat the leftover space */
}
if (res)
buf[res-1] = '\n'; /* eat the leftover space */
@@
-698,8
+695,8
@@
static ssize_t bonding_store_arp_targets(struct device *d,
if (buf[0] == '+') {
if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
printk(KERN_ERR DRV_NAME
if (buf[0] == '+') {
if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
printk(KERN_ERR DRV_NAME
- ": %s: invalid ARP target %
u.%u.%u.%u
specified for addition\n",
- bond->dev->name,
NIPQUAD(newtarget)
);
+ ": %s: invalid ARP target %
pI4
specified for addition\n",
+ bond->dev->name,
&newtarget
);
ret = -EINVAL;
goto out;
}
ret = -EINVAL;
goto out;
}
@@
-707,8
+704,8
@@
static ssize_t bonding_store_arp_targets(struct device *d,
for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
if (targets[i] == newtarget) { /* duplicate */
printk(KERN_ERR DRV_NAME
for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
if (targets[i] == newtarget) { /* duplicate */
printk(KERN_ERR DRV_NAME
- ": %s: ARP target %
u.%u.%u.%u
is already present\n",
- bond->dev->name,
NIPQUAD(newtarget)
);
+ ": %s: ARP target %
pI4
is already present\n",
+ bond->dev->name,
&newtarget
);
if (done)
targets[i] = 0;
ret = -EINVAL;
if (done)
targets[i] = 0;
ret = -EINVAL;
@@
-716,8
+713,8
@@
static ssize_t bonding_store_arp_targets(struct device *d,
}
if (targets[i] == 0 && !done) {
printk(KERN_INFO DRV_NAME
}
if (targets[i] == 0 && !done) {
printk(KERN_INFO DRV_NAME
- ": %s: adding ARP target %
d.%d.%d.%d
.\n",
- bond->dev->name,
NIPQUAD(newtarget)
);
+ ": %s: adding ARP target %
pI4
.\n",
+ bond->dev->name,
&newtarget
);
done = 1;
targets[i] = newtarget;
}
done = 1;
targets[i] = newtarget;
}
@@
-734,8
+731,8
@@
static ssize_t bonding_store_arp_targets(struct device *d,
else if (buf[0] == '-') {
if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
printk(KERN_ERR DRV_NAME
else if (buf[0] == '-') {
if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
printk(KERN_ERR DRV_NAME
- ": %s: invalid ARP target %
d.%d.%d.%d
specified for removal\n",
- bond->dev->name,
NIPQUAD(newtarget)
);
+ ": %s: invalid ARP target %
pI4
specified for removal\n",
+ bond->dev->name,
&newtarget
);
ret = -EINVAL;
goto out;
}
ret = -EINVAL;
goto out;
}
@@
-743,16
+740,16
@@
static ssize_t bonding_store_arp_targets(struct device *d,
for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
if (targets[i] == newtarget) {
printk(KERN_INFO DRV_NAME
for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
if (targets[i] == newtarget) {
printk(KERN_INFO DRV_NAME
- ": %s: removing ARP target %
d.%d.%d.%d
.\n",
- bond->dev->name,
NIPQUAD(newtarget)
);
+ ": %s: removing ARP target %
pI4
.\n",
+ bond->dev->name,
&newtarget
);
targets[i] = 0;
done = 1;
}
}
if (!done) {
printk(KERN_INFO DRV_NAME
targets[i] = 0;
done = 1;
}
}
if (!done) {
printk(KERN_INFO DRV_NAME
- ": %s: unable to remove nonexistent ARP target %
d.%d.%d.%d
.\n",
- bond->dev->name,
NIPQUAD(newtarget)
);
+ ": %s: unable to remove nonexistent ARP target %
pI4
.\n",
+ bond->dev->name,
&newtarget
);
ret = -EINVAL;
goto out;
}
ret = -EINVAL;
goto out;
}
@@
-1394,13
+1391,11
@@
static ssize_t bonding_show_ad_partner_mac(struct device *d,
{
int count = 0;
struct bonding *bond = to_bond(d);
{
int count = 0;
struct bonding *bond = to_bond(d);
- DECLARE_MAC_BUF(mac);
if (bond->params.mode == BOND_MODE_8023AD) {
struct ad_info ad_info;
if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
if (bond->params.mode == BOND_MODE_8023AD) {
struct ad_info ad_info;
if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
- count = sprintf(buf,"%s\n",
- print_mac(mac, ad_info.partner_system));
+ count = sprintf(buf, "%pM\n", ad_info.partner_system);
}
}
}
}