diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/llc/llc_output.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/llc/llc_output.c')
| -rw-r--r-- | net/llc/llc_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/llc/llc_output.c b/net/llc/llc_output.c index b4d55b6abb67..b4e668e0e12c 100644 --- a/net/llc/llc_output.c +++ b/net/llc/llc_output.c | |||
| @@ -30,7 +30,8 @@ | |||
| 30 | * Fills MAC header fields, depending on MAC type. Returns 0, If MAC type | 30 | * Fills MAC header fields, depending on MAC type. Returns 0, If MAC type |
| 31 | * is a valid type and initialization completes correctly 1, otherwise. | 31 | * is a valid type and initialization completes correctly 1, otherwise. |
| 32 | */ | 32 | */ |
| 33 | int llc_mac_hdr_init(struct sk_buff *skb, unsigned char *sa, unsigned char *da) | 33 | int llc_mac_hdr_init(struct sk_buff *skb, |
| 34 | const unsigned char *sa, const unsigned char *da) | ||
| 34 | { | 35 | { |
| 35 | int rc = 0; | 36 | int rc = 0; |
| 36 | 37 | ||