summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2009-02-22 00:03:19 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-22 19:54:47 -0800
commit0117cfabe3ba9b430c6ff6eecd4fdc569977f24f (patch)
tree9a312a491177562110bc91279809746883624bcc
parent01af4a0e3cce86212f6bf54ebe8f84d7219c862a (diff)
snap: handle registration error and compile warning
If this module can't load, it is almost certainly because something else is already bound to that SAP. So in that case, return the same error code as other SAP usage, and fail the module load. Also fixes a compiler warning about printk of non const. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/802/psnap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/802/psnap.c b/net/802/psnap.c
index 6ed711748f2..bdbffa3cb04 100644
--- a/net/802/psnap.c
+++ b/net/802/psnap.c
@@ -95,15 +95,16 @@ static int snap_request(struct datalink_proto *dl,
EXPORT_SYMBOL(register_snap_client);
EXPORT_SYMBOL(unregister_snap_client);
-static char snap_err_msg[] __initdata =
+static const char snap_err_msg[] __initconst =
KERN_CRIT "SNAP - unable to register with 802.2\n";
static int __init snap_init(void)
{
snap_sap = llc_sap_open(0xAA, snap_rcv);
-
- if (!snap_sap)
+ if (!snap_sap) {
printk(snap_err_msg);
+ return -EBUSY;
+ }
return 0;
}