Message ID | 20090320084314.5761b1d9@nehalam |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Em Fri, Mar 20, 2009 at 08:43:14AM -0700, Stephen Hemminger escreveu: > Protocols should be able to use constant value for the descriptor. > Minor whitespace cleanup as well > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Looks ok, thanks Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> > --- a/net/802/psnap.c 2009-03-19 23:47:22.745964788 -0700 > +++ b/net/802/psnap.c 2009-03-20 08:33:46.694749299 -0700 > @@ -29,7 +29,7 @@ static struct llc_sap *snap_sap; > /* > * Find a snap client by matching the 5 bytes. > */ > -static struct datalink_proto *find_snap_client(unsigned char *desc) > +static struct datalink_proto *find_snap_client(const unsigned char *desc) > { > struct datalink_proto *proto = NULL, *p; > > @@ -122,7 +122,7 @@ module_exit(snap_exit); > /* > * Register SNAP clients. We don't yet use this for IP. > */ > -struct datalink_proto *register_snap_client(unsigned char *desc, > +struct datalink_proto *register_snap_client(const unsigned char *desc, > int (*rcvfunc)(struct sk_buff *, > struct net_device *, > struct packet_type *, > @@ -137,7 +137,7 @@ struct datalink_proto *register_snap_cli > > proto = kmalloc(sizeof(*proto), GFP_ATOMIC); > if (proto) { > - memcpy(proto->type, desc,5); > + memcpy(proto->type, desc, 5); > proto->rcvfunc = rcvfunc; > proto->header_length = 5 + 3; /* snap + 802.2 */ > proto->request = snap_request; > --- a/include/net/psnap.h 2009-03-19 23:48:33.929963947 -0700 > +++ b/include/net/psnap.h 2009-03-19 23:49:25.792963671 -0700 > @@ -1,7 +1,11 @@ > #ifndef _NET_PSNAP_H > #define _NET_PSNAP_H > > -extern 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)); > +extern struct datalink_proto * > +register_snap_client(const unsigned char *desc, > + int (*rcvfunc)(struct sk_buff *, struct net_device *, > + struct packet_type *, > + struct net_device *orig_dev)); > extern void unregister_snap_client(struct datalink_proto *proto); > > #endif -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Arnaldo Carvalho de Melo <acme@redhat.com> Date: Fri, 20 Mar 2009 15:16:25 -0300 > Em Fri, Mar 20, 2009 at 08:43:14AM -0700, Stephen Hemminger escreveu: > > Protocols should be able to use constant value for the descriptor. > > Minor whitespace cleanup as well > > > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> > > Looks ok, thanks > > > Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/net/802/psnap.c 2009-03-19 23:47:22.745964788 -0700 +++ b/net/802/psnap.c 2009-03-20 08:33:46.694749299 -0700 @@ -29,7 +29,7 @@ static struct llc_sap *snap_sap; /* * Find a snap client by matching the 5 bytes. */ -static struct datalink_proto *find_snap_client(unsigned char *desc) +static struct datalink_proto *find_snap_client(const unsigned char *desc) { struct datalink_proto *proto = NULL, *p; @@ -122,7 +122,7 @@ module_exit(snap_exit); /* * Register SNAP clients. We don't yet use this for IP. */ -struct datalink_proto *register_snap_client(unsigned char *desc, +struct datalink_proto *register_snap_client(const unsigned char *desc, int (*rcvfunc)(struct sk_buff *, struct net_device *, struct packet_type *, @@ -137,7 +137,7 @@ struct datalink_proto *register_snap_cli proto = kmalloc(sizeof(*proto), GFP_ATOMIC); if (proto) { - memcpy(proto->type, desc,5); + memcpy(proto->type, desc, 5); proto->rcvfunc = rcvfunc; proto->header_length = 5 + 3; /* snap + 802.2 */ proto->request = snap_request; --- a/include/net/psnap.h 2009-03-19 23:48:33.929963947 -0700 +++ b/include/net/psnap.h 2009-03-19 23:49:25.792963671 -0700 @@ -1,7 +1,11 @@ #ifndef _NET_PSNAP_H #define _NET_PSNAP_H -extern 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)); +extern struct datalink_proto * +register_snap_client(const unsigned char *desc, + int (*rcvfunc)(struct sk_buff *, struct net_device *, + struct packet_type *, + struct net_device *orig_dev)); extern void unregister_snap_client(struct datalink_proto *proto); #endif
Protocols should be able to use constant value for the descriptor. Minor whitespace cleanup as well Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html