The following commit has been merged in the merge/master branch: commit 8c0156ed299baf4fb2893ec6ee281dd687f5298c Author: Antonio Quartulli ordex@autistici.org Date: Sat Apr 7 00:39:30 2012 +0200

batman-adv: declare a constant address as static const

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

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 92137af..bbebc19 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/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;