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

Commit f4ad2b16 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[LLC]: llc_mac_hdr_init const arguments 



Cleanup of LLC.  llc_mac_hdr_init can take constant arguments,
and it is defined twice once in llc_output.h that is otherwise unused.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fda93d92

include/net/llc.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ extern int llc_rcv(struct sk_buff *skb, struct net_device *dev, 
		   struct packet_type *pt, struct net_device *orig_dev);



extern int llc_mac_hdr_init(struct sk_buff *skb,

			    unsigned char *sa, unsigned char *da);

			    const unsigned char *sa, const unsigned char *da);



extern void llc_add_pack(int type, void (*handler)(struct llc_sap *sap,

						   struct sk_buff *skb));

net/llc/llc_c_ac.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <net/llc_pdu.h>

#include <net/llc.h>



#include "llc_output.h"



static int llc_conn_ac_inc_vs_by_1(struct sock *sk, struct sk_buff *skb);

static void llc_process_tmr_ev(struct sock *sk, struct sk_buff *skb);

net/llc/llc_output.c

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
 *	Fills MAC header fields, depending on MAC type. Returns 0, If MAC type

 *	is a valid type and initialization completes correctly 1, otherwise.

 */

int llc_mac_hdr_init(struct sk_buff *skb, unsigned char *sa, unsigned char *da)

int llc_mac_hdr_init(struct sk_buff *skb,

		     const unsigned char *sa, const unsigned char *da)

{

	int rc = 0;

net/llc/llc_output.h

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
#ifndef LLC_OUTPUT_H

#define LLC_OUTPUT_H

/*

 * Copyright (c) 1997 by Procom Technology, Inc.

 * 		 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>

 *

 * This program can be redistributed or modified under the terms of the

 * GNU General Public License version 2 as published by the Free Software

 * Foundation.

 * This program is distributed without any warranty or implied warranty

 * of merchantability or fitness for a particular purpose.

 *

 * See the GNU General Public License version 2 for more details.

 */



struct sk_buff;



int llc_mac_hdr_init(struct sk_buff *skb, unsigned char *sa, unsigned char *da);



#endif /* LLC_OUTPUT_H */

net/llc/llc_s_ac.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <net/llc_s_ac.h>

#include <net/llc_s_ev.h>

#include <net/llc_sap.h>

#include "llc_output.h"





/**

 *	llc_sap_action_unit_data_ind - forward UI PDU to network layer