* [NET_SCHED 04/04]: cls_flow: support classification based on VLAN tag
From: Patrick McHardy @ 2008-02-05 14:29 UTC (permalink / raw)
To: davem; +Cc: netdev, Patrick McHardy
In-Reply-To: <20080205142902.13543.88604.sendpatchset@localhost.localdomain>
[NET_SCHED]: cls_flow: support classification based on VLAN tag
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 104092e6d90cba5fa00902a3154155872d693f42
tree 0e3fd5871a861fa022bbc2f34d314bb8672b556a
parent 03faf81b8195be455c3c7592d76d712ea9d80b13
author Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:23 +0100
committer Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:23 +0100
include/linux/pkt_cls.h | 1 +
net/sched/cls_flow.c | 12 ++++++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 40fac8c..28dfc61 100644
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -348,6 +348,7 @@ enum
FLOW_KEY_RTCLASSID,
FLOW_KEY_SKUID,
FLOW_KEY_SKGID,
+ FLOW_KEY_VLAN_TAG,
__FLOW_KEY_MAX,
};
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index eeb223c..971b867 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -19,6 +19,7 @@
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/ipv6.h>
+#include <linux/if_vlan.h>
#include <net/pkt_cls.h>
#include <net/ip.h>
@@ -270,6 +271,15 @@ static u32 flow_get_skgid(const struct sk_buff *skb)
return 0;
}
+static u32 flow_get_vlan_tag(const struct sk_buff *skb)
+{
+ u16 uninitialized_var(tag);
+
+ if (vlan_get_tag(skb, &tag) < 0)
+ return 0;
+ return tag & VLAN_VID_MASK;
+}
+
static u32 flow_key_get(const struct sk_buff *skb, int key)
{
switch (key) {
@@ -305,6 +315,8 @@ static u32 flow_key_get(const struct sk_buff *skb, int key)
return flow_get_skuid(skb);
case FLOW_KEY_SKGID:
return flow_get_skgid(skb);
+ case FLOW_KEY_VLAN_TAG:
+ return flow_get_vlan_tag(skb);
default:
WARN_ON(1);
return 0;
^ permalink raw reply related
* [VLAN 03/04]: Constify skb argument to vlan_get_tag()
From: Patrick McHardy @ 2008-02-05 14:29 UTC (permalink / raw)
To: davem; +Cc: netdev, Patrick McHardy
In-Reply-To: <20080205142902.13543.88604.sendpatchset@localhost.localdomain>
[VLAN]: Constify skb argument to vlan_get_tag()
Required by next patch to use it from the flow classifier.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 03faf81b8195be455c3c7592d76d712ea9d80b13
tree 9da377d2bd44421494a4c4d7cf6c705d199c26ce
parent 2e5915ef51e55135522e59e041bb176432857d82
author Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:23 +0100
committer Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:23 +0100
include/linux/if_vlan.h | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 34f40ef..79504b2 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -327,7 +327,7 @@ static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb, unsigned short t
*
* Returns error if the skb is not of VLAN type
*/
-static inline int __vlan_get_tag(struct sk_buff *skb, unsigned short *tag)
+static inline int __vlan_get_tag(const struct sk_buff *skb, unsigned short *tag)
{
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data;
@@ -347,7 +347,8 @@ static inline int __vlan_get_tag(struct sk_buff *skb, unsigned short *tag)
*
* Returns error if @skb->cb[] is not set correctly
*/
-static inline int __vlan_hwaccel_get_tag(struct sk_buff *skb, unsigned short *tag)
+static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,
+ unsigned short *tag)
{
struct vlan_skb_tx_cookie *cookie;
@@ -370,7 +371,7 @@ static inline int __vlan_hwaccel_get_tag(struct sk_buff *skb, unsigned short *ta
*
* Returns error if the skb is not VLAN tagged
*/
-static inline int vlan_get_tag(struct sk_buff *skb, unsigned short *tag)
+static inline int vlan_get_tag(const struct sk_buff *skb, unsigned short *tag)
{
if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
return __vlan_hwaccel_get_tag(skb, tag);
^ permalink raw reply related
* [NET_SCHED 02/04]: cls_flow: fix key mask validity check
From: Patrick McHardy @ 2008-02-05 14:29 UTC (permalink / raw)
To: davem; +Cc: netdev, Patrick McHardy
In-Reply-To: <20080205142902.13543.88604.sendpatchset@localhost.localdomain>
[NET_SCHED]: cls_flow: fix key mask validity check
Since we're using fls(), we need to check whether the value is non-zero first.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 2e5915ef51e55135522e59e041bb176432857d82
tree 9a42fac3d1646a378acdc91b55642b68c9d97dde
parent adfab462c5e0a32ffff274927bba4eec3afc6e35
author Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:23 +0100
committer Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:23 +0100
net/sched/cls_flow.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index 8d76986..eeb223c 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -402,12 +402,13 @@ static int flow_change(struct tcf_proto *tp, unsigned long base,
if (tb[TCA_FLOW_KEYS]) {
keymask = nla_get_u32(tb[TCA_FLOW_KEYS]);
- if (fls(keymask) - 1 > FLOW_KEY_MAX)
- return -EOPNOTSUPP;
nkeys = hweight32(keymask);
if (nkeys == 0)
return -EINVAL;
+
+ if (fls(keymask) - 1 > FLOW_KEY_MAX)
+ return -EOPNOTSUPP;
}
err = tcf_exts_validate(tp, tb, tca[TCA_RATE], &e, &flow_ext_map);
^ permalink raw reply related
* [NET_SCHED 01/04]: em_meta: fix compile warning
From: Patrick McHardy @ 2008-02-05 14:29 UTC (permalink / raw)
To: davem; +Cc: netdev, Patrick McHardy
In-Reply-To: <20080205142902.13543.88604.sendpatchset@localhost.localdomain>
[NET_SCHED]: em_meta: fix compile warning
net/sched/em_meta.c: In function 'meta_int_vlan_tag':
net/sched/em_meta.c:179: warning: 'tag' may be used uninitialized in this function
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit adfab462c5e0a32ffff274927bba4eec3afc6e35
tree bfac456798152d7ea6bedcca4a03b4f045605d3d
parent fb1c15ba9ebcab6478a409051ad26d7d180fe286
author Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:21 +0100
committer Patrick McHardy <kaber@trash.net> Tue, 05 Feb 2008 15:22:21 +0100
net/sched/em_meta.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index 9c2ec19..2a7e648 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -176,7 +176,7 @@ META_COLLECTOR(var_dev)
META_COLLECTOR(int_vlan_tag)
{
- unsigned short tag;
+ unsigned short uninitialized_var(tag);
if (vlan_get_tag(skb, &tag) < 0)
*err = -1;
else
^ permalink raw reply related
* [NET_SCHED 00/04]: Two fixes + cls_flow VLAN tag based classification
From: Patrick McHardy @ 2008-02-05 14:29 UTC (permalink / raw)
To: davem; +Cc: netdev, Patrick McHardy
These patches fix a compile warning in em_meta, an invalid check in
the flow classifier and add VLAN tag based classification to cls_flow.
Please apply, thanks.
include/linux/if_vlan.h | 7 ++++---
include/linux/pkt_cls.h | 1 +
net/sched/cls_flow.c | 17 +++++++++++++++--
net/sched/em_meta.c | 2 +-
4 files changed, 21 insertions(+), 6 deletions(-)
Patrick McHardy (4):
[NET_SCHED]: em_meta: fix compile warning
[NET_SCHED]: cls_flow: fix key mask validity check
[VLAN]: Constify skb argument to vlan_get_tag()
[NET_SCHED]: cls_flow: support classification based on VLAN tag
^ permalink raw reply
* Re: [PATCH] vlan tag match
From: Patrick McHardy @ 2008-02-05 14:26 UTC (permalink / raw)
To: David Miller; +Cc: shemminger, netdev
In-Reply-To: <20080205.032040.20578647.davem@davemloft.net>
David Miller wrote:
> 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.
No, but I already added it myself. I'll post it in a new thread.
BTW, Stephen, I noticed your ematch patch doesn't mask out the
VLAN priority which is also included in the return value of
vlan_get_tag(), is that intentional?
^ permalink raw reply
* etcnet Wi-Fi tuning
From: Van Petron @ 2008-02-05 2:32 UTC (permalink / raw)
To: netdev
Hello,
Can you help me? What can I read to solve the task:
The is Altlinux installed on the computer with Ethernet card connected
with the local network/Internet (DHCP) + WiFi USB stick.
There is notebook with Windows XP + Wi-FI PCMCIA card.
I want to connect with notebook AD-HOC: Samba, printer (on my PC
(CUPS)). I also want to retransmit local network/Internet to the notebook.
Altlinux has etcnet.
I made some tuning in ifaces/wlan0, but notebook cannot connect
with wi-fi net "Ivp" (there are two, and it cannot connect with each of
then).
Folder wlan0:
ipv4address:
192.168.0.2/24
ipv4route:
default via 192.168.0.1
iwconfig:
essid Ivp
mode 1
ap 00-50-22-E2-B6-OF
channel 3
rate 54M
options:
TYPE=eth
MODULE=ndiswrapper
NEVER_RMMOD=YES
USE_HOTPLUG=no
ONBOOT=yes
wpa_supplicant.conf:
ctrl_interface=/var/run/wpa_supplicant
update_config=1
network={
ssid="Ivp"
bssid=00-15-E9-B3-2A-20
key_mgmt=NONE
}
What is wrong?
I.P.
^ permalink raw reply
* [PATCH] virtio_net: Fix open <-> interrupt race
From: Christian Borntraeger @ 2008-02-05 13:36 UTC (permalink / raw)
To: netdev; +Cc: Rusty Russell, dor.laor, Anthony Liguori, virtualization
I got the following oops during interface ifup. Unfortunately its not
easily reproducable so I cant say for sure that my fix fixes this
problem, but I am confident and I think its correct anyway:
<2>kernel BUG at /space/kvm/drivers/virtio/virtio_ring.c:234!
<4>illegal operation: 0001 [#1] PREEMPT SMP
<4>Modules linked in:
<4>CPU: 0 Not tainted 2.6.24zlive-guest-07293-gf1ca151-dirty #91
<4>Process swapper (pid: 0, task: 0000000000800938, ksp: 000000000084ddb8)
<4>Krnl PSW : 0404300180000000 0000000000466374 (vring_disable_cb+0x30/0x34)
<4> R:0 T:1 IO:0 EX:0 Key:0 M:1 W:0 P:0 AS:0 CC:3 PM:0 EA:3
<4>Krnl GPRS: 0000000000000001 0000000000000001 0000000010003800 0000000000466344
<4> 000000000e980900 00000000008848b0 000000000084e748 0000000000000000
<4> 000000000087b300 0000000000001237 0000000000001237 000000000f85bdd8
<4> 000000000e980920 00000000001137c0 0000000000464754 000000000f85bdd8
<4>Krnl Code: 0000000000466368: e3b0b0700004 lg %r11,112(%r11)
<4> 000000000046636e: 07fe bcr 15,%r14
<4> 0000000000466370: a7f40001 brc 15,466372
<4> >0000000000466374: a7f4fff6 brc 15,466360
<4> 0000000000466378: eb7ff0500024 stmg %r7,%r15,80(%r15)
<4> 000000000046637e: a7f13e00 tmll %r15,15872
<4> 0000000000466382: b90400ef lgr %r14,%r15
<4> 0000000000466386: a7840001 brc 8,466388
<4>Call Trace:
<4>([<000201500f85c000>] 0x201500f85c000)
<4> [<0000000000466556>] vring_interrupt+0x72/0x88
<4> [<00000000004801a0>] kvm_extint_handler+0x34/0x44
<4> [<000000000010d22c>] do_extint+0xbc/0xf8
<4> [<0000000000113f98>] ext_no_vtime+0x16/0x1a
<4> [<000000000010a182>] cpu_idle+0x216/0x238
<4>([<000000000010a162>] cpu_idle+0x1f6/0x238)
<4> [<0000000000568656>] rest_init+0xaa/0xb8
<4> [<000000000084ee2c>] start_kernel+0x3fc/0x490
<4> [<0000000000100020>] _stext+0x20/0x80
<4>
<4> <0>Kernel panic - not syncing: Fatal exception in interrupt
<4>
After looking at the code and the dump I think the following scenario
happened: Ifup was running on cpu2 and the interrupt arrived on cpu0.
Now virtnet_open on cpu 2 managed to execute napi_enable and disable_cb
but did not execute rx_schedule. Meanwhile on cpu 0 skb_recv_done was
called by vring_interrupt, executed netif_rx_schedule_prep, which
succeeded and therefore called disable_cb. This triggered the BUG_ON,
as interrupts were already disabled by cpu 2.
I think the proper solution is to make the call to disable_cb depend on
the atomic update of NAPI_STATE_SCHED by using netif_rx_schedule_prep
in the same way as skb_recv_done.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
drivers/net/virtio_net.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
Index: kvm/drivers/net/virtio_net.c
===================================================================
--- kvm.orig/drivers/net/virtio_net.c
+++ kvm/drivers/net/virtio_net.c
@@ -321,10 +321,12 @@ static int virtnet_open(struct net_devic
/* If all buffers were filled by other side before we napi_enabled, we
* won't get another interrupt, so process any outstanding packets
- * now. virtnet_poll wants re-enable the queue, so we disable here. */
- vi->rvq->vq_ops->disable_cb(vi->rvq);
- netif_rx_schedule(vi->dev, &vi->napi);
-
+ * now. virtnet_poll wants re-enable the queue, so we disable here.
+ * We synchronize against interrupts via NAPI_STATE_SCHED */
+ if (netif_rx_schedule_prep(dev, &vi->napi)) {
+ vi->rvq->vq_ops->disable_cb(vi->rvq);
+ __netif_rx_schedule(dev, &vi->napi);
+ }
return 0;
}
--
IBM Deutschland Entwicklung GmbH
Vorsitzender des Aufsichtsrats: Martin Jetter
Geschäftsführung: Herbert Kircher
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294
^ permalink raw reply
* Re: locking api self-test hanging
From: Bernhard Walle @ 2008-02-05 13:23 UTC (permalink / raw)
To: Andrew Morton; +Cc: netdev, Ingo Molnar, linux-kernel, Stephen Hemminger
In-Reply-To: <20080204050421.0febc754.akpm@linux-foundation.org>
* Andrew Morton <akpm@linux-foundation.org> [2008-02-04 14:04]:
>
> but that code really needs help.
Using spin_lock_irqsave() is what rtc_get_rtc_time() does which was
used before I changed to get_rtc_time() does. So it should be ok. I
missed that difference. However, I agree with you the whole RTC
"emulation" per HPET is a bit unclean. However, I have too little
experience in this code area to come up with a proper redesign. I just
ported it from the old RTC to the new RTC module interface.
> Bernhard, I believe the checklist items in Documentation/SubmitChecklist
> would have prevented this at the source.
Yes. I must admit that I didn't know that document. I used
checkpatch.pl, but that's of course only for coding style. I'll try to
follow the points in SubmitChecklist in future.
Bernhard
^ permalink raw reply
* [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
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