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

Commit d97a077a authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

wan: make LAPB callbacks const 



This is compile tested only.
Suggested by dumpster diving in PAX.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 026359bc

drivers/net/wan/hdlc_x25.c

+8 −8
Original line number Diff line number Diff line
@@ -134,15 +134,15 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev) 


static int x25_open(struct net_device *dev)

{

	struct lapb_register_struct cb;

	int result;



	cb.connect_confirmation = x25_connected;

	cb.connect_indication = x25_connected;

	cb.disconnect_confirmation = x25_disconnected;

	cb.disconnect_indication = x25_disconnected;

	cb.data_indication = x25_data_indication;

	cb.data_transmit = x25_data_transmit;

	static const struct lapb_register_struct cb = {

		.connect_confirmation = x25_connected,

		.connect_indication = x25_connected,

		.disconnect_confirmation = x25_disconnected,

		.disconnect_indication = x25_disconnected,

		.data_indication = x25_data_indication,

		.data_transmit = x25_data_transmit,

	};



	result = lapb_register(dev, &cb);

	if (result != LAPB_OK)

drivers/net/wan/lapbether.c

+1 −2
Original line number Diff line number Diff line
@@ -259,14 +259,13 @@ static int lapbeth_set_mac_address(struct net_device *dev, void *addr) 
}





static struct lapb_register_struct lapbeth_callbacks = {

static const struct lapb_register_struct lapbeth_callbacks = {

	.connect_confirmation    = lapbeth_connected,

	.connect_indication      = lapbeth_connected,

	.disconnect_confirmation = lapbeth_disconnected,

	.disconnect_indication   = lapbeth_disconnected,

	.data_indication         = lapbeth_data_indication,

	.data_transmit           = lapbeth_data_transmit,



};



/*

drivers/net/wan/x25_asy.c

+1 −2
Original line number Diff line number Diff line
@@ -434,14 +434,13 @@ static void x25_asy_disconnected(struct net_device *dev, int reason) 
	netif_rx(skb);

}



static struct lapb_register_struct x25_asy_callbacks = {

static const struct lapb_register_struct x25_asy_callbacks = {

	.connect_confirmation = x25_asy_connected,

	.connect_indication = x25_asy_connected,

	.disconnect_confirmation = x25_asy_disconnected,

	.disconnect_indication = x25_asy_disconnected,

	.data_indication = x25_asy_data_indication,

	.data_transmit = x25_asy_data_transmit,



};

include/linux/lapb.h

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ struct lapb_parms_struct { 
	unsigned int mode;

};



extern int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks);

extern int lapb_register(struct net_device *dev,

			 const struct lapb_register_struct *callbacks);

extern int lapb_unregister(struct net_device *dev);

extern int lapb_getparms(struct net_device *dev, struct lapb_parms_struct *parms);

extern int lapb_setparms(struct net_device *dev, struct lapb_parms_struct *parms);

include/net/lapb.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct lapb_cb { 
	struct sk_buff_head	write_queue;

	struct sk_buff_head	ack_queue;

	unsigned char		window;

	struct lapb_register_struct callbacks;

	const struct lapb_register_struct *callbacks;



	/* FRMR control information */

	struct lapb_frame	frmr_data;