5 files changed, 16 insertions, 14 deletions

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 7c78e2640190..e1bc090bc00a 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -172,7 +172,6 @@ static int br_set_mac_address(struct net_device *dev, void *p)
 
         spin_lock_bh(&br->lock);
         if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) {
-                dev->addr_assign_type &= ~NET_ADDR_RANDOM;
                 memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
                 br_fdb_change_mac_address(br, addr->sa_data);
                 br_stp_change_bridge_id(br, addr->sa_data);
@@ -185,10 +184,10 @@ static int br_set_mac_address(struct net_device *dev, void *p)
 
 static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
-        strcpy(info->driver, "bridge");
-        strcpy(info->version, BR_VERSION);
-        strcpy(info->fw_version, "N/A");
-        strcpy(info->bus_info, "N/A");
+        strlcpy(info->driver, "bridge", sizeof(info->driver));
+        strlcpy(info->version, BR_VERSION, sizeof(info->version));
+        strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
+        strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));
 }
 
 static netdev_features_t br_fix_features(struct net_device *dev,
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 37fe693471a8..2148d474a04f 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -66,14 +66,14 @@ void br_port_carrier_check(struct net_bridge_port *p)
         struct net_device *dev = p->dev;
         struct net_bridge *br = p->br;
 
-        if (netif_running(dev) && netif_carrier_ok(dev))
+        if (netif_running(dev) && netif_oper_up(dev))
                 p->path_cost = port_cost(dev);
 
         if (!netif_running(br->dev))
                 return;
 
         spin_lock_bh(&br->lock);
-        if (netif_running(dev) && netif_carrier_ok(dev)) {
+        if (netif_running(dev) && netif_oper_up(dev)) {
                 if (p->state == BR_STATE_DISABLED)
                         br_stp_enable_port(p);
         } else {
@@ -148,7 +148,7 @@ static void del_nbp(struct net_bridge_port *p)
         netdev_rx_handler_unregister(dev);
         synchronize_net();
 
-        netdev_set_master(dev, NULL);
+        netdev_upper_dev_unlink(dev, br->dev);
 
         br_multicast_del_port(p);
 
@@ -364,7 +364,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         if (br_netpoll_info(br) && ((err = br_netpoll_enable(p, GFP_KERNEL))))
                 goto err3;
 
-        err = netdev_set_master(dev, br->dev);
+        err = netdev_master_upper_dev_link(dev, br->dev);
         if (err)
                 goto err4;
 
@@ -383,7 +383,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         spin_lock_bh(&br->lock);
         changed_addr = br_stp_recalculate_bridge_id(br);
 
-        if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) &&
+        if (netif_running(dev) && netif_oper_up(dev) &&
             (br->dev->flags & IFF_UP))
                 br_stp_enable_port(p);
         spin_unlock_bh(&br->lock);
@@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         return 0;
 
 err5:
-        netdev_set_master(dev, NULL);
+        netdev_upper_dev_unlink(dev, br->dev);
 err4:
         br_netpoll_disable(p);
 err3:
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 5dc66abcc9e2..39ca9796f3f7 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -181,8 +181,11 @@ static int br_set_port_state(struct net_bridge_port *p, u8 state)
         if (p->br->stp_enabled == BR_KERNEL_STP)
                 return -EBUSY;
 
+        /* if device is not up, change is not allowed
+         * if link is not present, only allowable state is disabled
+         */
         if (!netif_running(p->dev) ||
-            (!netif_carrier_ok(p->dev) && state != BR_STATE_DISABLED))
+            (!netif_oper_up(p->dev) && state != BR_STATE_DISABLED))
                 return -ENETDOWN;
 
         p->state = state;
diff --git a/net/bridge/br_notify.c b/net/bridge/br_notify.c
index a76b62135558..1644b3e1f947 100644
--- a/net/bridge/br_notify.c
+++ b/net/bridge/br_notify.c
@@ -82,7 +82,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v
                 break;
 
         case NETDEV_UP:
-                if (netif_carrier_ok(dev) && (br->dev->flags & IFF_UP)) {
+                if (netif_running(br->dev) && netif_oper_up(dev)) {
                         spin_lock_bh(&br->lock);
                         br_stp_enable_port(p);
                         spin_unlock_bh(&br->lock);
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 9d5a414a3943..7b5197c7de13 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -54,7 +54,7 @@ void br_stp_enable_bridge(struct net_bridge *br)
         br_config_bpdu_generation(br);
 
         list_for_each_entry(p, &br->port_list, list) {
-                if ((p->dev->flags & IFF_UP) && netif_carrier_ok(p->dev))
+                if (netif_running(p->dev) && netif_oper_up(p->dev))
                         br_stp_enable_port(p);
 
         }