summaryrefslogtreecommitdiffstats
path: root/net/tipc/port.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-07-30 09:13:03 +0200
committerJohannes Berg <johannes.berg@intel.com>2012-07-30 09:13:03 +0200
commitfcb06702f023a0e7b1e6ebf9746f34b610ca0508 (patch)
treedb022324c4978dd9af059be38822d23455a45f55 /net/tipc/port.h
parentwireless: reg: restore previous behaviour of chan->max_power calculations (diff)
parentbcma: add missing iounmap on error path (diff)
downloadlinux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.tar.xz
linux-fcb06702f023a0e7b1e6ebf9746f34b610ca0508.zip
Merge remote-tracking branch 'wireless/master' into mac80211
Diffstat (limited to 'net/tipc/port.h')
-rw-r--r--net/tipc/port.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tipc/port.h b/net/tipc/port.h
index 98cbec9c4532..4660e3065790 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -79,6 +79,7 @@ typedef void (*tipc_continue_event) (void *usr_handle, u32 portref);
* struct user_port - TIPC user port (used with native API)
* @usr_handle: user-specified field
* @ref: object reference to associated TIPC port
+ *
* <various callback routines>
*/
struct user_port {