The following commit has been merged in the next branch: commit 94ca5612239be50e4a03a76118759e0c93c3dcf4 Author: Antonio Quartulli ordex@autistici.org Date: Thu Apr 12 09:07:28 2012 +0200

batman-adv: use static const for STP constant address

stp_addr is now declared as a simple "uint8_t []", but since it's content is statically defined, it has to be declared as "static const uint8_t []"

Signed-off-by: Antonio Quartulli ordex@autistici.org

diff --git a/soft-interface.c b/soft-interface.c index f8a4a59..b56dafd 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -131,7 +131,8 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface) struct hard_iface *primary_if = NULL; struct bcast_packet *bcast_packet; struct vlan_ethhdr *vhdr; - uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; + static const uint8_t stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, + 0x00}; unsigned int header_len = 0; int data_len = skb->len, ret; short vid __maybe_unused = -1;