aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/psnap.h6
-rw-r--r--net/802/psnap.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/include/net/psnap.h b/include/net/psnap.h
index b2e01cc3fc8a..fe456c295b04 100644
--- a/include/net/psnap.h
+++ b/include/net/psnap.h
@@ -1,7 +1,11 @@
1#ifndef _NET_PSNAP_H 1#ifndef _NET_PSNAP_H
2#define _NET_PSNAP_H 2#define _NET_PSNAP_H
3 3
4extern struct datalink_proto *register_snap_client(unsigned char *desc, int (*rcvfunc)(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *orig_dev)); 4extern struct datalink_proto *
5register_snap_client(const unsigned char *desc,
6 int (*rcvfunc)(struct sk_buff *, struct net_device *,
7 struct packet_type *,
8 struct net_device *orig_dev));
5extern void unregister_snap_client(struct datalink_proto *proto); 9extern void unregister_snap_client(struct datalink_proto *proto);
6 10
7#endif 11#endif
diff --git a/net/802/psnap.c b/net/802/psnap.c
index bdbffa3cb043..6fea0750662b 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -29,7 +29,7 @@ static struct llc_sap *snap_sap;
29/* 29/*
30 * Find a snap client by matching the 5 bytes. 30 * Find a snap client by matching the 5 bytes.
31 */ 31 */
32static struct datalink_proto *find_snap_client(unsigned char *desc) 32static struct datalink_proto *find_snap_client(const unsigned char *desc)
33{ 33{
34 struct datalink_proto *proto = NULL, *p; 34 struct datalink_proto *proto = NULL, *p;
35 35
@@ -122,7 +122,7 @@ module_exit(snap_exit);
122/* 122/*
123 * Register SNAP clients. We don't yet use this for IP. 123 * Register SNAP clients. We don't yet use this for IP.
124 */ 124 */
125struct datalink_proto *register_snap_client(unsigned char *desc, 125struct datalink_proto *register_snap_client(const unsigned char *desc,
126 int (*rcvfunc)(struct sk_buff *, 126 int (*rcvfunc)(struct sk_buff *,
127 struct net_device *, 127 struct net_device *,
128 struct packet_type *, 128 struct packet_type *,
@@ -137,7 +137,7 @@ struct datalink_proto *register_snap_client(unsigned char *desc,
137 137
138 proto = kmalloc(sizeof(*proto), GFP_ATOMIC); 138 proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
139 if (proto) { 139 if (proto) {
140 memcpy(proto->type, desc,5); 140 memcpy(proto->type, desc, 5);
141 proto->rcvfunc = rcvfunc; 141 proto->rcvfunc = rcvfunc;
142 proto->header_length = 5 + 3; /* snap + 802.2 */ 142 proto->header_length = 5 + 3; /* snap + 802.2 */
143 proto->request = snap_request; 143 proto->request = snap_request;