Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba5cbd1 authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

atm: fix const assignment/discard warnings in the ATM networking driver 



Fix const assignment/discard warnings in the ATM networking driver.

The lane2_assoc_ind() function needed its arguments changing to match changes
in the lane2_ops struct (patch 61c33e01
"atm: use const where reasonable").

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarChas Williams <chas@cmf.nrl.navy.mil>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a8341b6

net/atm/mpc.c

+13 −9
Original line number Diff line number Diff line
@@ -62,11 +62,13 @@ static void MPOA_cache_impos_rcvd(struct k_message *msg, struct mpoa_client *mpc 
static void set_mpc_ctrl_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc);

static void set_mps_mac_addr_rcvd(struct k_message *mesg, struct mpoa_client *mpc);



static uint8_t *copy_macs(struct mpoa_client *mpc, uint8_t *router_mac,

			  uint8_t *tlvs, uint8_t mps_macs, uint8_t device_type);

static const uint8_t *copy_macs(struct mpoa_client *mpc,

				const uint8_t *router_mac,

				const uint8_t *tlvs, uint8_t mps_macs,

				uint8_t device_type);

static void purge_egress_shortcut(struct atm_vcc *vcc, eg_cache_entry *entry);



static void send_set_mps_ctrl_addr(char *addr, struct mpoa_client *mpc);

static void send_set_mps_ctrl_addr(const char *addr, struct mpoa_client *mpc);

static void mpoad_close(struct atm_vcc *vcc);

static int msg_from_mpoad(struct atm_vcc *vcc, struct sk_buff *skb);
@@ -351,12 +353,12 @@ static const char *mpoa_device_type_string(char type) 
 * lec sees a TLV it uses the pointer to call this function.

 *

 */

static void lane2_assoc_ind(struct net_device *dev, uint8_t *mac_addr,

			    uint8_t *tlvs, uint32_t sizeoftlvs)

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

			    const u8 *tlvs, u32 sizeoftlvs)

{

	uint32_t type;

	uint8_t length, mpoa_device_type, number_of_mps_macs;

	uint8_t *end_of_tlvs;

	const uint8_t *end_of_tlvs;

	struct mpoa_client *mpc;



	mpoa_device_type = number_of_mps_macs = 0; /* silence gcc */
@@ -430,8 +432,10 @@ static void lane2_assoc_ind(struct net_device *dev, uint8_t *mac_addr, 
 * plus the possible MAC address(es) to mpc->mps_macs.

 * For a freshly allocated MPOA client mpc->mps_macs == 0.

 */

static uint8_t *copy_macs(struct mpoa_client *mpc, uint8_t *router_mac,

			  uint8_t *tlvs, uint8_t mps_macs, uint8_t device_type)

static const uint8_t *copy_macs(struct mpoa_client *mpc,

				const uint8_t *router_mac,

				const uint8_t *tlvs, uint8_t mps_macs,

				uint8_t device_type)

{

	int num_macs;

	num_macs = (mps_macs > 1) ? mps_macs : 1;
@@ -811,7 +815,7 @@ static int atm_mpoa_mpoad_attach (struct atm_vcc *vcc, int arg) 
	return arg;

}



static void send_set_mps_ctrl_addr(char *addr, struct mpoa_client *mpc)

static void send_set_mps_ctrl_addr(const char *addr, struct mpoa_client *mpc)

{

	struct k_message mesg;