ppp: Add ppp_dev_name() exported function
authorJames Chapman <jchapman@katalix.com>
Fri, 2 Apr 2010 06:18:39 +0000 (06:18 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 3 Apr 2010 21:56:02 +0000 (14:56 -0700)
ppp_dev_name() gives PPP users visibility of a ppp channel's device
name. This can be used by L2TP drivers to dump the assigned PPP
interface name.

Signed-off-by: James Chapman <jchapman@katalix.com>
Reviewed-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ppp_generic.c
include/linux/ppp_channel.h

index 6d61602208c1f1470409c34717e7641e038b86a5..8a0dd8a843a9eb3f2409b1c600e426d42f46463b 100644 (file)
@@ -2162,6 +2162,24 @@ int ppp_unit_number(struct ppp_channel *chan)
        return unit;
 }
 
+/*
+ * Return the PPP device interface name of a channel.
+ */
+char *ppp_dev_name(struct ppp_channel *chan)
+{
+       struct channel *pch = chan->ppp;
+       char *name = NULL;
+
+       if (pch) {
+               read_lock_bh(&pch->upl);
+               if (pch->ppp && pch->ppp->dev)
+                       name = pch->ppp->dev->name;
+               read_unlock_bh(&pch->upl);
+       }
+       return name;
+}
+
+
 /*
  * Disconnect a channel from the generic layer.
  * This must be called in process context.
@@ -2890,6 +2908,7 @@ EXPORT_SYMBOL(ppp_register_channel);
 EXPORT_SYMBOL(ppp_unregister_channel);
 EXPORT_SYMBOL(ppp_channel_index);
 EXPORT_SYMBOL(ppp_unit_number);
+EXPORT_SYMBOL(ppp_dev_name);
 EXPORT_SYMBOL(ppp_input);
 EXPORT_SYMBOL(ppp_input_error);
 EXPORT_SYMBOL(ppp_output_wakeup);
index 0d3fa63e90ea28fc8494447aaeaa5eda27bb38c4..bff98ec1bfed2aa86e791ef7c6192cf37d29d2c0 100644 (file)
@@ -72,6 +72,9 @@ extern int ppp_channel_index(struct ppp_channel *);
 /* Get the unit number associated with a channel, or -1 if none */
 extern int ppp_unit_number(struct ppp_channel *);
 
+/* Get the device name associated with a channel, or NULL if none */
+extern char *ppp_dev_name(struct ppp_channel *);
+
 /*
  * SMP locking notes:
  * The channel code must ensure that when it calls ppp_unregister_channel,