[BRIDGE]: Multicast address as const.

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 6a69ace0fc72c4be85af000dc187254643d25411..1c714c6860e759f8af8e4a09416dfded27ededb9 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -19,7 +19,7 @@
 #include <linux/netfilter_bridge.h>
 #include "br_private.h"
 
-unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
+const unsigned char bridge_ula[6] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
 static int br_pass_frame_up_finish(struct sk_buff *skb)
 {

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 717d74ab1e99df87a99999f4b4c087dbc2450a28..5b1e0947e848f2f66e6b8d4d415c73a9969eef60 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -111,7 +111,7 @@ struct net_bridge
 };
 
 extern struct notifier_block br_device_notifier;
-extern unsigned char bridge_ula[6];
+extern const unsigned char bridge_ula[6];
 
 /* called under bridge lock */
 static inline int br_is_root_bridge(const struct net_bridge *br)

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index cb7789b0f84a4aad0d88491d211c105b0c4d3666..59605ae0ad380b68f9421456f95b5bf6b4912919 100644 (file)
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -110,7 +110,8 @@ void br_stp_disable_port(struct net_bridge_port *p)
 }
 
 /* called under bridge lock */
-static void br_stp_change_bridge_id(struct net_bridge *br, unsigned char *addr)
+static void br_stp_change_bridge_id(struct net_bridge *br, 
+                                   const unsigned char *addr)
 {
        unsigned char oldaddr[6];
        struct net_bridge_port *p;
@@ -137,16 +138,14 @@ static void br_stp_change_bridge_id(struct net_bridge *br, unsigned char *addr)
                br_become_root_bridge(br);
 }
 
-static unsigned char br_mac_zero[6];
+static const unsigned char br_mac_zero[6];
 
 /* called under bridge lock */
 void br_stp_recalculate_bridge_id(struct net_bridge *br)
 {
-       unsigned char *addr;
+       const unsigned char *addr = br_mac_zero;
        struct net_bridge_port *p;
 
-       addr = br_mac_zero;
-
        list_for_each_entry(p, &br->port_list, list) {
                if (addr == br_mac_zero ||
                    memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)