* [PATCH] [PPPOL2TP] Label unused warning when CONFIG_PROC_FS is not set.
From: Rami Rosen @ 2008-02-05 12:15 UTC (permalink / raw)
To: netdev, jeff, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
Hi,
When CONFIG_PROC_FS is not set and CONFIG_PPPOL2TP is set,
we have the following warning in build:
drivers/net/pppol2tp.c: In function 'pppol2tp_init':
drivers/net/pppol2tp.c:2472: warning: label
'out_unregister_pppox_proto' defined but not used
This patches fixes this warning by adding appropriate #ifdef.
Regards,
Rami Rosen
Signed-off-by: Rami Rosen <ramirose@gmail.com>
[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 420 bytes --]
diff --git a/drivers/net/pppol2tp.c b/drivers/net/pppol2tp.c
index 1b51bb6..5aa0a80 100644
--- a/drivers/net/pppol2tp.c
+++ b/drivers/net/pppol2tp.c
@@ -2468,9 +2468,10 @@ static int __init pppol2tp_init(void)
out:
return err;
-
+#ifdef CONFIG_PROC_FS
out_unregister_pppox_proto:
unregister_pppox_proto(PX_PROTO_OL2TP);
+#endif
out_unregister_pppol2tp_proto:
proto_unregister(&pppol2tp_sk_proto);
goto out;
^ permalink raw reply related
* Re: [PATCH] vlan tag match
From: David Miller @ 2008-02-05 11:20 UTC (permalink / raw)
To: shemminger; +Cc: kaber, netdev
In-Reply-To: <20080131215025.4ad118f2@extreme>
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 31 Jan 2008 21:50:25 -0800
> On Fri, 01 Feb 2008 06:34:34 +0100
> Patrick McHardy <kaber@trash.net> wrote:
>
> > Stephen Hemminger wrote:
> > > Provide a way to use tc filters on vlan tag even if tag is buried in
> > > skb due to hardware acceleration.
> >
> > Looks reasonable. Would you like to add the same feature to the
> > flow classifier?
>
> Yes, that would be good.
Did that patch get posted? I didn't see it.
^ permalink raw reply
* Re: [PATCH] vlan tag match
From: David Miller @ 2008-02-05 11:20 UTC (permalink / raw)
To: shemminger; +Cc: netdev, kaber
In-Reply-To: <20080131210732.25f42884@extreme>
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 31 Jan 2008 21:07:32 -0800
> Provide a way to use tc filters on vlan tag even if tag is buried in
> skb due to hardware acceleration.
>
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] add if_addrlabel.h to sanitized headers
From: David Miller @ 2008-02-05 11:19 UTC (permalink / raw)
To: shemminger; +Cc: netdev
In-Reply-To: <20080131223731.78bc6bef@extreme>
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 31 Jan 2008 22:37:31 -0800
> if_addrlabel.h is needed for iproute2 usage.
>
> Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
Applied, thanks.
^ permalink raw reply
* Re: [2.6 patch] rtnetlink.c: remove no longer used functions
From: David Miller @ 2008-02-05 11:17 UTC (permalink / raw)
To: bunk; +Cc: kaber, netdev
In-Reply-To: <20080201161904.GA12176@cs181133002.pp.htv.fi>
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 1 Feb 2008 18:19:04 +0200
> On Wed, Jan 30, 2008 at 09:04:33PM +0100, Patrick McHardy wrote:
> > Adrian Bunk wrote:
> >> This patch #if 0's the following no longer used functions:
> >> - rtattr_parse()
> >> - rtattr_strlcpy()
> >> - __rtattr_parse_nested_compat()
> >>
> >
> > Please remove them instead.
>
> Updated patch below.
Applied, thanks Adrian.
^ permalink raw reply
* Re: [PATCH][INET]: Fix accidentally broken inet(6)_hash_connect's port offset calculations.
From: David Miller @ 2008-02-05 11:14 UTC (permalink / raw)
To: xemul; +Cc: bunk, netdev, devel
In-Reply-To: <47A6C87D.7060304@openvz.org>
From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 04 Feb 2008 11:10:37 +0300
> The port offset calculations depend on the protocol family, but,
> as Adrian noticed, I broke this logic with the commit
>
> 5ee31fc1ecdcbc234c8c56dcacef87c8e09909d8
> [INET]: Consolidate inet(6)_hash_connect.
>
> Return this logic back, by passing the port offset directly into
> the consolidated function.
>
> Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
> Noticed-by: Adrian Bunk <bunk@kernel.org>
Applied, thanks.
^ permalink raw reply
* Re: [NET]: Remove further references to net-modules.txt
From: David Miller @ 2008-02-05 11:14 UTC (permalink / raw)
To: johfel; +Cc: netdev, trivial
In-Reply-To: <1202110300.28722.4.camel@localhost>
From: Johann Felix Soden <johfel@gmx.de>
Date: Mon, 04 Feb 2008 08:31:40 +0100
> From: Johann Felix Soden <johfel@users.sourceforge.net>
>
> The Kconfig of igb and enc28j60 contains references to
> obsolet Documentation/networking/net-modules.txt.
>
> Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net>
Applied, thanks.
^ permalink raw reply
* Re: [patch 7/7] rfcomm tty: destroy before tty_close()
From: David Miller @ 2008-02-05 11:12 UTC (permalink / raw)
To: akpm; +Cc: marcel, netdev, hidave.darkstar
In-Reply-To: <200802050748.m157m1v2010470@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:48:20 -0800
> From: Dave Young <hidave.darkstar@gmail.com>
>
> rfcomm dev could be deleted in tty_hangup, so we must not call
> rfcomm_dev_del again to prevent from destroying rfcomm dev before tty
> close.
>
> Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied, thanks.
^ permalink raw reply
* Re: [patch 6/7] hci_ldisc: fix null pointer deref
From: David Miller @ 2008-02-05 11:11 UTC (permalink / raw)
To: akpm; +Cc: marcel, netdev, david, alan, arjan
In-Reply-To: <200802050748.m157m0ne010461@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:48:18 -0800
> akpm:
>
> No idea. trollmerge.
>
> Cc: Arjan van de Ven <arjan@linux.intel.com>
> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
I'll let Marcel and/or Alan take a look at this one.
^ permalink raw reply
* Re: [patch 5/7] bluetooth: blacklist another Broadcom BCM2035 device
From: David Miller @ 2008-02-05 11:10 UTC (permalink / raw)
To: akpm; +Cc: marcel, netdev, andy
In-Reply-To: <200802050747.m157lwwg010458@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:48:17 -0800
> From: Andy Shevchenko <andy@smile.org.ua>
>
> This device is recognized as bluetooth, but still not works.
>
> Signed-off-by: Andy Shevchenko <andy@smile.org.ua>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied.
But, what driver should drive this device?
^ permalink raw reply
* Re: [patch 4/7] drivers/bluetooth/btsdio.c: fix double-free
From: David Miller @ 2008-02-05 11:09 UTC (permalink / raw)
To: akpm; +Cc: marcel, netdev, bunk
In-Reply-To: <200802050747.m157lvnE010455@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:48:16 -0800
> From: Adrian Bunk <bunk@kernel.org>
>
> This patch fixes a double-free spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied.
^ permalink raw reply
* Re: [patch 3/7] drivers/bluetooth/bpa10x.c: fix memleak
From: David Miller @ 2008-02-05 11:08 UTC (permalink / raw)
To: akpm; +Cc: marcel, netdev, bunk
In-Reply-To: <200802050747.m157lv5j010452@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:48:16 -0800
> From: Adrian Bunk <bunk@kernel.org>
>
> This patch fixea a memleak spotted by the Coverity checker.
>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied, thanks.
^ permalink raw reply
* Re: [patch 2/7] bluetooth: uninlining
From: David Miller @ 2008-02-05 11:08 UTC (permalink / raw)
To: akpm; +Cc: marcel, netdev
In-Reply-To: <200802050747.m157lueQ010449@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:48:15 -0800
> From: Andrew Morton <akpm@linux-foundation.org>
>
> Remove all those inlines which were either a) unneeded or b) increased code
> size.
>
> text data bss dec hex filename
> before: 6997 74 8 7079 1ba7 net/bluetooth/hidp/core.o
> after: 6492 74 8 6574 19ae net/bluetooth/hidp/core.o
>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied.
^ permalink raw reply
* Re: [patch 1/7] bluetooth: hidp_process_hid_control remove unnecessary parameter dealing
From: David Miller @ 2008-02-05 11:07 UTC (permalink / raw)
To: akpm; +Cc: marcel, netdev, hidave.darkstar
In-Reply-To: <200802050747.m157lt6g010446@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:48:13 -0800
> From: Dave Young <hidave.darkstar@gmail.com>
>
> According to the bluetooth HID spec v1.0 chapter 7.4.2
>
> "This code requests a major state change in a BT-HID device. A HID_CONTROL
> request does not generate a HANDSHAKE response."
>
> "A HID_CONTROL packet with a parameter of VIRTUAL_CABLE_UNPLUG is the only
> HID_CONTROL packet a device can send to a host. A host will ignore all other
> packets."
>
> So in the hidp_precess_hid_control function, we just need to deal with the
> UNLUG packet.
>
> Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied.
^ permalink raw reply
* Re: [patch 2/2] tun: impossible to deassert IFF_ONE_QUEUE or IFF_NO_PI
From: David Miller @ 2008-02-05 11:05 UTC (permalink / raw)
To: akpm; +Cc: netdev, nwfilardo, jeff, maxk
In-Reply-To: <200802050745.m157j2vh010306@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:45:21 -0800
> From: "Nathaniel Filardo" <nwfilardo@gmail.com>
>
> Taken from http://bugzilla.kernel.org/show_bug.cgi?id=9806
>
> The TUN/TAP driver only permits one-way transitions of IFF_NO_PI or
> IFF_ONE_QUEUE during the lifetime of a tap/tun interface. Note that
> tun_set_iff contains
>
> 541 if (ifr->ifr_flags & IFF_NO_PI)
> 542 tun->flags |= TUN_NO_PI;
> 543
> 544 if (ifr->ifr_flags & IFF_ONE_QUEUE)
> 545 tun->flags |= TUN_ONE_QUEUE;
>
> This is easily fixed by adding else branches which clear these bits.
>
> Steps to reproduce:
>
> This is easily reproduced by setting an interface persistant using tunctl then
> attempting to open it as IFF_TAP or IFF_TUN, without asserting the IFF_NO_PI
> flag. The ioctl() will succeed and the ifr.flags word is not modified, but the
> interface remains in IFF_NO_PI mode (as it was set by tunctl).
>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jeff Garzik <jeff@garzik.org>
> Acked-by: Maxim Krasnyansky <maxk@qualcomm.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied.
^ permalink raw reply
* Re: [patch 1/2] hamradio: fix dmascc section mismatch
From: David Miller @ 2008-02-05 11:04 UTC (permalink / raw)
To: akpm; +Cc: netdev, randy.dunlap, klaus.kudielka, sam
In-Reply-To: <200802050745.m157j1qJ010297@imap1.linux-foundation.org>
From: akpm@linux-foundation.org
Date: Mon, 04 Feb 2008 23:45:20 -0800
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> hw[] is used in both init and exit functions so it cannot be initdata (section
> mismatch is when CONFIG_MODULES=n and CONFIG_DMASCC=y).
>
> WARNING: vmlinux.o(.exit.text+0xba7): Section mismatch: reference to .init.data: (between 'dmascc_exit' and 'sixpack_exit_driver')
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Klaus Kudielka <klaus.kudielka@gmx.net>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Applied.
^ permalink raw reply
* Re: [PATCH] SCTP: Fix kernel panic while received AUTH chunk with BAD shared key identifier
From: David Miller @ 2008-02-05 11:03 UTC (permalink / raw)
To: yjwei; +Cc: vladislav.yasevich, nhorman, netdev, lksctp-developers
In-Reply-To: <47A81DBD.6000802@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 05 Feb 2008 17:26:37 +0900
> If SCTP-AUTH is enabled, received AUTH chunk with BAD shared key
> identifier will cause kernel panic.
...
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
> Acked-by: Neil Horman <nhorman@tuxdriver.com>
> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Applied.
^ permalink raw reply
* Re: [PATCH] SCTP: Fix kernel panic while received AUTH chunk while enabled auth
From: David Miller @ 2008-02-05 11:02 UTC (permalink / raw)
To: yjwei; +Cc: netdev, vladislav.yasevich, lksctp-developers
In-Reply-To: <47A81C72.8050207@cn.fujitsu.com>
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Tue, 05 Feb 2008 17:21:06 +0900
> If STCP is started while /proc/sys/net/sctp/auth_enable is set 0 and
> association is established between endpoints. Then if
> /proc/sys/net/sctp/auth_enable is set 1, a received AUTH chunk will
> cause kernel panic.
...
> Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
> Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Applied.
^ permalink raw reply
* Re: [PATCH] [IPV4]: Formatting fix for /proc/net/fib_trie.
From: David Miller @ 2008-02-05 10:58 UTC (permalink / raw)
To: den; +Cc: netdev, devel
In-Reply-To: <1202205536-9888-1-git-send-email-den@openvz.org>
From: "Denis V. Lunev" <den@openvz.org>
Date: Tue, 5 Feb 2008 12:58:56 +0300
> The line in the /proc/net/fib_trie for route with TOS specified
> - has extra \n at the end
> - does not have a space after route scope
> like below.
> |-- 1.1.1.1
> /32 universe UNICASTtos =1
>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
Applied, thanks.
^ permalink raw reply
* Re: [IPV6] fix sysctl compilation error
From: David Miller @ 2008-02-05 10:58 UTC (permalink / raw)
To: dlezcano; +Cc: yoshfuji, netdev
In-Reply-To: <47A827ED.6000908@fr.ibm.com>
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 05 Feb 2008 10:10:05 +0100
> Subject: fix sysctl compilation error
> From: Daniel Lezcano <dlezcano@fr.ibm.com>
>
> Move ipv6_icmp_sysctl_init and ipv6_route_sysctl_init into
> the right ifdef section otherwise that does not compile when
> CONFIG_SYSCTL=yes and CONFIG_PROC_FS=no
>
> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
> Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] [NET_SCHED] Add #ifdef CONFIG_NET_EMATCH in net/sched/cls_flow.c (latest git broken build)
From: David Miller @ 2008-02-05 10:57 UTC (permalink / raw)
To: ramirose; +Cc: kaber, lizf, linux-kernel, netdev
In-Reply-To: <eb3ff54b0802030051x604c991fwe11184e25d0a7550@mail.gmail.com>
From: "Rami Rosen" <ramirose@gmail.com>
Date: Sun, 3 Feb 2008 10:51:42 +0200
> The 2.6 latest git build was broken when using the following
> configuration options:
> CONFIG_NET_EMATCH=n
> CONFIG_NET_CLS_FLOW=y
>
> with the following error:
> net/sched/cls_flow.c: In function 'flow_dump':
> net/sched/cls_flow.c:598: error: 'struct tcf_ematch_tree' has no
> member named 'hdr'
> make[2]: *** [net/sched/cls_flow.o] Error 1
> make[1]: *** [net/sched] Error 2
> make: *** [net] Error 2
>
>
> see the recent post by Li Zefan:
> http://www.spinics.net/lists/netdev/msg54434.html
>
> The reason for this crash is that struct tcf_ematch_tree (net/pkt_cls.h) is
> empty when CONFIG_NET_EMATCH is not defined.
>
> When CONFIG_NET_EMATCH is defined, the tcf_ematch_tree structure indeed holds
> a struct tcf_ematch_tree_hdr (hdr) as flow_dump() expects.
>
> This patch adds #ifdef CONFIG_NET_EMATCH in flow_dump to avoid this.
>
> Signed-off-by: Rami Rosen <ramirose@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [FIB] fix fib_proc compilation error
From: David Miller @ 2008-02-05 10:54 UTC (permalink / raw)
To: dlezcano; +Cc: netdev
In-Reply-To: <47A8285A.7040205@fr.ibm.com>
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 05 Feb 2008 10:11:54 +0100
> Subject: fix fib_proc compilation error
> From: Daniel Lezcano <dlezcano@fr.ibm.com>
>
> Fix fib_proc_[init|exit] definition when CONFIG_PROCFS=no
>
> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Li Zefan already posted a fix for this which I've just
applied.
^ permalink raw reply
* Re: [2.6 patch] xfrm4_beet_input(): fix an if()
From: David Miller @ 2008-02-05 10:51 UTC (permalink / raw)
To: herbert; +Cc: bunk, netdev
In-Reply-To: <20080202222226.GB31388@gondor.apana.org.au>
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 3 Feb 2008 09:22:26 +1100
> On Sat, Feb 02, 2008 at 11:16:35PM +0200, Adrian Bunk wrote:
> > A bug every C programmer makes at some point in time...
> >
> > Signed-off-by: Adrian Bunk <bunk@kernel.org>
>
> Good catch!
>
> Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Applied.
^ permalink raw reply
* [PATCH] [IPV4]: Formatting fix for /proc/net/fib_trie.
From: Denis V. Lunev @ 2008-02-05 9:58 UTC (permalink / raw)
To: davem; +Cc: netdev, devel, Denis V. Lunev
The line in the /proc/net/fib_trie for route with TOS specified
- has extra \n at the end
- does not have a space after route scope
like below.
|-- 1.1.1.1
/32 universe UNICASTtos =1
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
net/ipv4/fib_trie.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 35851c9..f5fba3f 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2431,8 +2431,7 @@ static int fib_trie_seq_show(struct seq_file *seq, void *v)
rtn_type(buf2, sizeof(buf2),
fa->fa_type));
if (fa->fa_tos)
- seq_printf(seq, "tos =%d\n",
- fa->fa_tos);
+ seq_printf(seq, " tos=%d", fa->fa_tos);
seq_putc(seq, '\n');
}
}
--
1.5.3.rc5
^ permalink raw reply related
* Re: [PATCH 00/24 for-2.6.25] DM9000 updates for 2.6.25
From: Laurent Pinchart @ 2008-02-05 9:52 UTC (permalink / raw)
To: Ben Dooks; +Cc: netdev, jeff, akpm, daniel
In-Reply-To: <20080205000159.432081941@fluff.org.uk>
[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]
On Tuesday 05 February 2008 01:01, Ben Dooks wrote:
> This patch set is a series of updates for the DM9000
> driver, to tidy-up some of the source, stop the accesses
> to the PHY and EEPROM sitting and spinning with locks
> held, and to add ethtool support.
>
> This set includes a pair of patches from Laurent Pinchart
> for addition platform-data based configuration, please
> apply these from this if you can attribute these correctly
> to Laurent, otherwise ask Laurent to resubmit. I have
> signed-off-by both these patches, but would be equally
> happy acking them.
If you can apply the patches without a resubmission that's of course less work
for me :-) Otherwise I can resubmit them.
> The only missing item in this series is to replace the
> old timer based polling code. This series has been sitting
> long enough on my own trees, and having MII link status
> reports is not a driver-threatening bug.
>
> Hopefully this series meets up to everyone's approval and
> can be applied whilst the current merge window is upon us.
--
Laurent Pinchart
CSE Semaphore Belgium
Chaussée de Bruxelles, 732A
B-1410 Waterloo
Belgium
T +32 (2) 387 42 59
F +32 (2) 387 42 75
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox