From 6e0e9388b5cb0366e93915ab9d0d0bf12b09d5c2 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Sat, 26 Jun 2010 00:28:18 +0200 Subject: Staging: batman-adv: Convert names from Java to C style Useless but meaningfull patch that converts JavaStyle names into c_style Signed-off-by: Antonio Quartulli Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- drivers/staging/batman-adv/soft-interface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/staging/batman-adv/soft-interface.c') diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c index ef7860d53a5c..2ea97de435ce 100644 --- a/drivers/staging/batman-adv/soft-interface.c +++ b/drivers/staging/batman-adv/soft-interface.c @@ -36,7 +36,7 @@ static uint32_t bcast_seqno = 1; /* give own bcast messages seq numbers to avoid static int32_t skb_packets; static int32_t skb_bad_packets; -unsigned char mainIfAddr[ETH_ALEN]; +unsigned char main_if_addr[ETH_ALEN]; static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd); static void bat_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info); @@ -58,7 +58,7 @@ static const struct ethtool_ops bat_ethtool_ops = { void set_main_if_addr(uint8_t *addr) { - memcpy(mainIfAddr, addr, ETH_ALEN); + memcpy(main_if_addr, addr, ETH_ALEN); } int my_skb_push(struct sk_buff *skb, unsigned int len) @@ -164,7 +164,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev) /* hw address of first interface is the orig mac because only * this mac is known throughout the mesh */ - memcpy(bcast_packet->orig, mainIfAddr, ETH_ALEN); + memcpy(bcast_packet->orig, main_if_addr, ETH_ALEN); /* set broadcast sequence number */ bcast_packet->seqno = htonl(bcast_seqno); -- cgit v1.2.3