summaryrefslogtreecommitdiffstats
path: root/net/llc/llc_station.c
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2010-10-11 19:26:50 +0200
committerRobert Richter <robert.richter@amd.com>2010-10-11 19:26:50 +0200
commitad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5 (patch)
tree2565121e4b9945d953e02c77a2e53065b3789aa4 /net/llc/llc_station.c
parentsh: oprofile: Use perf-events oprofile backend (diff)
parentMerge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/o... (diff)
downloadlinux-ad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5.tar.xz
linux-ad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5.zip
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
Diffstat (limited to 'net/llc/llc_station.c')
-rw-r--r--net/llc/llc_station.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c
index e4dae0244d76..cf4aea3ba30f 100644
--- a/net/llc/llc_station.c
+++ b/net/llc/llc_station.c
@@ -689,7 +689,7 @@ static void llc_station_rcv(struct sk_buff *skb)
int __init llc_station_init(void)
{
- u16 rc = -ENOBUFS;
+ int rc = -ENOBUFS;
struct sk_buff *skb;
struct llc_station_state_ev *ev;