Merge branch 'merge'

[mv-sheeva.git] / net / llc / llc_output.c

diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c
index b4d55b6abb679f33c39fa54c0d3f370a3909c448..b4e668e0e12c46da8b7f5cbf1a6a24a9c5da73ba 100644 (file)
--- a/net/llc/llc_output.c
+++ b/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;