---

yaml --- r: 22326 b: refs/heads/master c: f4ad2b1 h: refs/heads/master v: v3
git-mirror · Mar 21, 2006 · d4326d0 · d4326d0
1 parent 353ca49
commit d4326d0
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 25 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fda93d92d7824159d8532995072dde2bee4bc4b3
+refs/heads/master: f4ad2b162d653e4a6e57d598119e3820c65fef71
diff --git a/trunk/include/net/llc.h b/trunk/include/net/llc.h
@@ -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));

diff --git a/trunk/net/llc/llc_c_ac.c b/trunk/net/llc/llc_c_ac.c
@@ -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);

diff --git a/trunk/net/llc/llc_output.c b/trunk/net/llc/llc_output.c
@@ -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;
 

diff --git a/trunk/net/llc/llc_output.h b/trunk/net/llc/llc_output.h
diff --git a/trunk/net/llc/llc_s_ac.c b/trunk/net/llc/llc_s_ac.c
@@ -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