Commit 61c33e01 authored by Mitchell Blank Jr's avatar Mitchell Blank Jr Committed by David S. Miller
Browse files

atm: use const where reasonable 



From: Mitchell Blank Jr <mitch@sfgoth.com>

Signed-off-by: default avatarChas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df3bc8bd

net/atm/addr.c

+5 −5
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "signaling.h"

#include "addr.h"



static int check_addr(struct sockaddr_atmsvc *addr)

static int check_addr(const struct sockaddr_atmsvc *addr)

{

	int i;
@@ -23,7 +23,7 @@ static int check_addr(struct sockaddr_atmsvc *addr) 
	return -EINVAL;

}



static int identical(struct sockaddr_atmsvc *a, struct sockaddr_atmsvc *b)

static int identical(const struct sockaddr_atmsvc *a, const struct sockaddr_atmsvc *b)

{

	if (*a->sas_addr.prv)

		if (memcmp(a->sas_addr.prv, b->sas_addr.prv, ATM_ESA_LEN))
@@ -35,7 +35,7 @@ static int identical(struct sockaddr_atmsvc *a, struct sockaddr_atmsvc *b) 
	return !strcmp(a->sas_addr.pub, b->sas_addr.pub);

}



static void notify_sigd(struct atm_dev *dev)

static void notify_sigd(const struct atm_dev *dev)

{

	struct sockaddr_atmpvc pvc;
@@ -63,7 +63,7 @@ void atm_reset_addr(struct atm_dev *dev, enum atm_addr_type_t atype) 
		notify_sigd(dev);

}



int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

int atm_add_addr(struct atm_dev *dev, const struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t atype)

{

	unsigned long flags;
@@ -98,7 +98,7 @@ int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr, 
	return 0;

}



int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

int atm_del_addr(struct atm_dev *dev, const struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t atype)

{

	unsigned long flags;

net/atm/addr.h

+2 −2
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ 
#include <linux/atmdev.h>



void atm_reset_addr(struct atm_dev *dev, enum atm_addr_type_t type);

int atm_add_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

int atm_add_addr(struct atm_dev *dev, const struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t type);

int atm_del_addr(struct atm_dev *dev, struct sockaddr_atmsvc *addr,

int atm_del_addr(struct atm_dev *dev, const struct sockaddr_atmsvc *addr,

		 enum atm_addr_type_t type);

int atm_get_addr(struct atm_dev *dev, struct sockaddr_atmsvc __user *buf,

		 size_t size, enum atm_addr_type_t type);

net/atm/br2684.c

+7 −7
Original line number Diff line number Diff line
@@ -52,12 +52,12 @@ static void skb_debug(const struct sk_buff *skb) 
#define ETHERTYPE_IPV6	0x86, 0xdd

#define PAD_BRIDGED	0x00, 0x00



static unsigned char ethertype_ipv4[] = { ETHERTYPE_IPV4 };

static unsigned char ethertype_ipv6[] = { ETHERTYPE_IPV6 };

static unsigned char llc_oui_pid_pad[] =

static const unsigned char ethertype_ipv4[] = { ETHERTYPE_IPV4 };

static const unsigned char ethertype_ipv6[] = { ETHERTYPE_IPV6 };

static const unsigned char llc_oui_pid_pad[] =

			{ LLC, SNAP_BRIDGED, PID_ETHERNET, PAD_BRIDGED };

static unsigned char llc_oui_ipv4[] = { LLC, SNAP_ROUTED, ETHERTYPE_IPV4 };

static unsigned char llc_oui_ipv6[] = { LLC, SNAP_ROUTED, ETHERTYPE_IPV6 };

static const unsigned char llc_oui_ipv4[] = { LLC, SNAP_ROUTED, ETHERTYPE_IPV4 };

static const unsigned char llc_oui_ipv6[] = { LLC, SNAP_ROUTED, ETHERTYPE_IPV6 };



enum br2684_encaps {

	e_vc = BR2684_ENCAPS_VC,
@@ -217,8 +217,8 @@ static int br2684_xmit_vcc(struct sk_buff *skb, struct br2684_dev *brdev, 
	return 1;

}



static inline struct br2684_vcc *pick_outgoing_vcc(struct sk_buff *skb,

						   struct br2684_dev *brdev)

static inline struct br2684_vcc *pick_outgoing_vcc(const struct sk_buff *skb,

						   const struct br2684_dev *brdev)

{

	return list_empty(&brdev->brvccs) ? NULL : list_entry_brvcc(brdev->brvccs.next);	/* 1 vcc/dev right now */

}

net/atm/common.c

+4 −4
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int adjust_tp(struct atm_trafprm *tp,unsigned char aal) 
}





static int check_ci(struct atm_vcc *vcc, short vpi, int vci)

static int check_ci(const struct atm_vcc *vcc, short vpi, int vci)

{

	struct hlist_head *head = &vcc_hash[vci &

					(VCC_HTABLE_SIZE - 1)];
@@ -290,7 +290,7 @@ static int check_ci(struct atm_vcc *vcc, short vpi, int vci) 
}





static int find_ci(struct atm_vcc *vcc, short *vpi, int *vci)

static int find_ci(const struct atm_vcc *vcc, short *vpi, int *vci)

{

	static short p;        /* poor man's per-device cache */

	static int c;
@@ -646,7 +646,7 @@ static int atm_change_qos(struct atm_vcc *vcc,struct atm_qos *qos) 
}





static int check_tp(struct atm_trafprm *tp)

static int check_tp(const struct atm_trafprm *tp)

{

	/* @@@ Should be merged with adjust_tp */

	if (!tp->traffic_class || tp->traffic_class == ATM_ANYCLASS) return 0;
@@ -663,7 +663,7 @@ static int check_tp(struct atm_trafprm *tp) 
}





static int check_qos(struct atm_qos *qos)

static int check_qos(const struct atm_qos *qos)

{

	int error;

net/atm/lec.c

+27 −28
Original line number Diff line number Diff line
@@ -65,36 +65,36 @@ static int lec_close(struct net_device *dev); 
static struct net_device_stats *lec_get_stats(struct net_device *dev);

static void lec_init(struct net_device *dev);

static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,

					  unsigned char *mac_addr);

					  const unsigned char *mac_addr);

static int lec_arp_remove(struct lec_priv *priv,

			  struct lec_arp_table *to_remove);

/* LANE2 functions */

static void lane2_associate_ind(struct net_device *dev, u8 *mac_address,

				u8 *tlvs, u32 sizeoftlvs);

static int lane2_resolve(struct net_device *dev, u8 *dst_mac, int force,

static void lane2_associate_ind(struct net_device *dev, const u8 *mac_address,

				const u8 *tlvs, u32 sizeoftlvs);

static int lane2_resolve(struct net_device *dev, const u8 *dst_mac, int force,

			 u8 **tlvs, u32 *sizeoftlvs);

static int lane2_associate_req(struct net_device *dev, u8 *lan_dst,

			       u8 *tlvs, u32 sizeoftlvs);

static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,

			       const u8 *tlvs, u32 sizeoftlvs);



static int lec_addr_delete(struct lec_priv *priv, unsigned char *atm_addr,

static int lec_addr_delete(struct lec_priv *priv, const unsigned char *atm_addr,

			   unsigned long permanent);

static void lec_arp_check_empties(struct lec_priv *priv,

				  struct atm_vcc *vcc, struct sk_buff *skb);

static void lec_arp_destroy(struct lec_priv *priv);

static void lec_arp_init(struct lec_priv *priv);

static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,

				       unsigned char *mac_to_find,

				       const unsigned char *mac_to_find,

				       int is_rdesc,

				       struct lec_arp_table **ret_entry);

static void lec_arp_update(struct lec_priv *priv, unsigned char *mac_addr,

			   unsigned char *atm_addr, unsigned long remoteflag,

static void lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,

			   const unsigned char *atm_addr, unsigned long remoteflag,

			   unsigned int targetless_le_arp);

static void lec_flush_complete(struct lec_priv *priv, unsigned long tran_id);

static int lec_mcast_make(struct lec_priv *priv, struct atm_vcc *vcc);

static void lec_set_flush_tran_id(struct lec_priv *priv,

				  unsigned char *atm_addr,

				  const unsigned char *atm_addr,

				  unsigned long tran_id);

static void lec_vcc_added(struct lec_priv *priv, struct atmlec_ioc *ioc_data,

static void lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,

			  struct atm_vcc *vcc,

			  void (*old_push) (struct atm_vcc *vcc,

					    struct sk_buff *skb));
@@ -634,7 +634,7 @@ static struct atm_dev lecatm_dev = { 
 */

static int

send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,

	     unsigned char *mac_addr, unsigned char *atm_addr,

	     const unsigned char *mac_addr, const unsigned char *atm_addr,

	     struct sk_buff *data)

{

	struct sock *sk;
@@ -705,10 +705,9 @@ static void lec_init(struct net_device *dev) 
	dev->set_multicast_list = lec_set_multicast_list;

	dev->do_ioctl = NULL;

	printk("%s: Initialized!\n", dev->name);

	return;

}



static unsigned char lec_ctrl_magic[] = {

static const unsigned char lec_ctrl_magic[] = {

	0xff,

	0x00,

	0x01,
@@ -1276,7 +1275,7 @@ module_exit(lane_module_cleanup); 
 * lec will be used.

 * If dst_mac == NULL, targetless LE_ARP will be sent

 */

static int lane2_resolve(struct net_device *dev, u8 *dst_mac, int force,

static int lane2_resolve(struct net_device *dev, const u8 *dst_mac, int force,

			 u8 **tlvs, u32 *sizeoftlvs)

{

	unsigned long flags;
@@ -1322,8 +1321,8 @@ static int lane2_resolve(struct net_device *dev, u8 *dst_mac, int force, 
 * Returns 1 for success, 0 for failure (out of memory)

 *

 */

static int lane2_associate_req(struct net_device *dev, u8 *lan_dst,

			       u8 *tlvs, u32 sizeoftlvs)

static int lane2_associate_req(struct net_device *dev, const u8 *lan_dst,

			       const u8 *tlvs, u32 sizeoftlvs)

{

	int retval;

	struct sk_buff *skb;
@@ -1358,8 +1357,8 @@ static int lane2_associate_req(struct net_device *dev, u8 *lan_dst, 
 * LANE2: 3.1.5, LE_ASSOCIATE.indication

 *

 */

static void lane2_associate_ind(struct net_device *dev, u8 *mac_addr,

				u8 *tlvs, u32 sizeoftlvs)

static void lane2_associate_ind(struct net_device *dev, const u8 *mac_addr,

				const u8 *tlvs, u32 sizeoftlvs)

{

#if 0

	int i = 0;
@@ -1744,7 +1743,7 @@ static void lec_arp_destroy(struct lec_priv *priv) 
 * Find entry by mac_address

 */

static struct lec_arp_table *lec_arp_find(struct lec_priv *priv,

					  unsigned char *mac_addr)

					  const unsigned char *mac_addr)

{

	struct hlist_node *node;

	struct hlist_head *head;
@@ -1764,7 +1763,7 @@ static struct lec_arp_table *lec_arp_find(struct lec_priv *priv, 
}



static struct lec_arp_table *make_entry(struct lec_priv *priv,

					unsigned char *mac_addr)

					const unsigned char *mac_addr)

{

	struct lec_arp_table *to_return;
@@ -1921,7 +1920,7 @@ static void lec_arp_check_expire(struct work_struct *work) 
 *

 */

static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv,

				       unsigned char *mac_to_find, int is_rdesc,

				       const unsigned char *mac_to_find, int is_rdesc,

				       struct lec_arp_table **ret_entry)

{

	unsigned long flags;
@@ -2017,7 +2016,7 @@ static struct atm_vcc *lec_arp_resolve(struct lec_priv *priv, 
}



static int

lec_addr_delete(struct lec_priv *priv, unsigned char *atm_addr,

lec_addr_delete(struct lec_priv *priv, const unsigned char *atm_addr,

		unsigned long permanent)

{

	unsigned long flags;
@@ -2047,8 +2046,8 @@ lec_addr_delete(struct lec_priv *priv, unsigned char *atm_addr, 
 * Notifies:  Response to arp_request (atm_addr != NULL)

 */

static void

lec_arp_update(struct lec_priv *priv, unsigned char *mac_addr,

	       unsigned char *atm_addr, unsigned long remoteflag,

lec_arp_update(struct lec_priv *priv, const unsigned char *mac_addr,

	       const unsigned char *atm_addr, unsigned long remoteflag,

	       unsigned int targetless_le_arp)

{

	unsigned long flags;
@@ -2148,7 +2147,7 @@ lec_arp_update(struct lec_priv *priv, unsigned char *mac_addr, 
 * Notifies: Vcc setup ready

 */

static void

lec_vcc_added(struct lec_priv *priv, struct atmlec_ioc *ioc_data,

lec_vcc_added(struct lec_priv *priv, const struct atmlec_ioc *ioc_data,

	      struct atm_vcc *vcc,

	      void (*old_push) (struct atm_vcc *vcc, struct sk_buff *skb))

{
@@ -2336,7 +2335,7 @@ static void lec_flush_complete(struct lec_priv *priv, unsigned long tran_id) 


static void

lec_set_flush_tran_id(struct lec_priv *priv,

		      unsigned char *atm_addr, unsigned long tran_id)

		      const unsigned char *atm_addr, unsigned long tran_id)

{

	unsigned long flags;

	struct hlist_node *node;