* [PATCH 1/2] snap: use const for descirptor
@ 2009-03-20 15:43 Stephen Hemminger
2009-03-20 15:44 ` [PATCH 2/2] ipx: use constant for strings and desciptor Stephen Hemminger
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Stephen Hemminger @ 2009-03-20 15:43 UTC (permalink / raw)
To: David Miller, Arnaldo Carvalho de Melo; +Cc: netdev
Protocols should be able to use constant value for the descriptor.
Minor whitespace cleanup as well
Signed-off-by: Stephen Hemminger <shemminger@vyatta.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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ipx: use constant for strings and desciptor
2009-03-20 15:43 [PATCH 1/2] snap: use const for descirptor Stephen Hemminger
@ 2009-03-20 15:44 ` Stephen Hemminger
2009-03-20 15:45 ` Stephen Hemminger
2009-03-20 18:16 ` [PATCH 1/2] snap: use const for descirptor Arnaldo Carvalho de Melo
2 siblings, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2009-03-20 15:44 UTC (permalink / raw)
To: David Miller, Arnaldo Carvalho de Melo; +Cc: netdev
Fix compiler warning about non-const format string.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/net/ipx/af_ipx.c 2009-03-19 23:37:56.671964109 -0700
+++ b/net/ipx/af_ipx.c 2009-03-19 23:46:55.613777665 -0700
@@ -1975,15 +1975,15 @@ static struct notifier_block ipx_dev_not
extern struct datalink_proto *make_EII_client(void);
extern void destroy_EII_client(struct datalink_proto *);
-static unsigned char ipx_8022_type = 0xE0;
-static unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 };
-static char ipx_EII_err_msg[] __initdata =
+static const unsigned char ipx_8022_type = 0xE0;
+static const unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 };
+static const char ipx_EII_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with Ethernet II\n";
-static char ipx_8023_err_msg[] __initdata =
+static const char ipx_8023_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with 802.3\n";
-static char ipx_llc_err_msg[] __initdata =
+static const char ipx_llc_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with 802.2\n";
-static char ipx_snap_err_msg[] __initdata =
+static const char ipx_snap_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with SNAP\n";
static int __init ipx_init(void)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ipx: use constant for strings and desciptor
2009-03-20 15:43 [PATCH 1/2] snap: use const for descirptor Stephen Hemminger
2009-03-20 15:44 ` [PATCH 2/2] ipx: use constant for strings and desciptor Stephen Hemminger
@ 2009-03-20 15:45 ` Stephen Hemminger
2009-03-20 18:17 ` Arnaldo Carvalho de Melo
2009-03-20 18:16 ` [PATCH 1/2] snap: use const for descirptor Arnaldo Carvalho de Melo
2 siblings, 1 reply; 7+ messages in thread
From: Stephen Hemminger @ 2009-03-20 15:45 UTC (permalink / raw)
To: David Miller, Arnaldo Carvalho de Melo; +Cc: netdev
Fix compiler warning about non-const format string.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/net/ipx/af_ipx.c 2009-03-19 23:37:56.671964109 -0700
+++ b/net/ipx/af_ipx.c 2009-03-19 23:46:55.613777665 -0700
@@ -1975,15 +1975,15 @@ static struct notifier_block ipx_dev_not
extern struct datalink_proto *make_EII_client(void);
extern void destroy_EII_client(struct datalink_proto *);
-static unsigned char ipx_8022_type = 0xE0;
-static unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 };
-static char ipx_EII_err_msg[] __initdata =
+static const unsigned char ipx_8022_type = 0xE0;
+static const unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 };
+static const char ipx_EII_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with Ethernet II\n";
-static char ipx_8023_err_msg[] __initdata =
+static const char ipx_8023_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with 802.3\n";
-static char ipx_llc_err_msg[] __initdata =
+static const char ipx_llc_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with 802.2\n";
-static char ipx_snap_err_msg[] __initdata =
+static const char ipx_snap_err_msg[] __initconst =
KERN_CRIT "IPX: Unable to register with SNAP\n";
static int __init ipx_init(void)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] snap: use const for descirptor
2009-03-20 15:43 [PATCH 1/2] snap: use const for descirptor Stephen Hemminger
2009-03-20 15:44 ` [PATCH 2/2] ipx: use constant for strings and desciptor Stephen Hemminger
2009-03-20 15:45 ` Stephen Hemminger
@ 2009-03-20 18:16 ` Arnaldo Carvalho de Melo
2009-03-22 2:08 ` David Miller
2 siblings, 1 reply; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2009-03-20 18:16 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David Miller, netdev
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ipx: use constant for strings and desciptor
2009-03-20 15:45 ` Stephen Hemminger
@ 2009-03-20 18:17 ` Arnaldo Carvalho de Melo
2009-03-22 2:08 ` David Miller
0 siblings, 1 reply; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2009-03-20 18:17 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: David Miller, netdev
Em Fri, Mar 20, 2009 at 08:45:39AM -0700, Stephen Hemminger escreveu:
> Fix compiler warning about non-const format string.
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
- Arnaldo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] snap: use const for descirptor
2009-03-20 18:16 ` [PATCH 1/2] snap: use const for descirptor Arnaldo Carvalho de Melo
@ 2009-03-22 2:08 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2009-03-22 2:08 UTC (permalink / raw)
To: acme; +Cc: shemminger, netdev
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ipx: use constant for strings and desciptor
2009-03-20 18:17 ` Arnaldo Carvalho de Melo
@ 2009-03-22 2:08 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2009-03-22 2:08 UTC (permalink / raw)
To: acme; +Cc: shemminger, netdev
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 20 Mar 2009 15:17:23 -0300
> Em Fri, Mar 20, 2009 at 08:45:39AM -0700, Stephen Hemminger escreveu:
> > Fix compiler warning about non-const format string.
> >
> > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> >
>
> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Applied.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-03-22 2:08 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-20 15:43 [PATCH 1/2] snap: use const for descirptor Stephen Hemminger
2009-03-20 15:44 ` [PATCH 2/2] ipx: use constant for strings and desciptor Stephen Hemminger
2009-03-20 15:45 ` Stephen Hemminger
2009-03-20 18:17 ` Arnaldo Carvalho de Melo
2009-03-22 2:08 ` David Miller
2009-03-20 18:16 ` [PATCH 1/2] snap: use const for descirptor Arnaldo Carvalho de Melo
2009-03-22 2:08 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).