Netdev List
 help / color / mirror / Atom feed
* Re: pull request: wireless-next-2.6 2010-07-23
From: John W. Linville @ 2010-07-23 21:39 UTC (permalink / raw)
  To: David Miller
  Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20100723.140320.116366019.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>

On Fri, Jul 23, 2010 at 02:03:20PM -0700, David Miller wrote:
> From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
> Date: Fri, 23 Jul 2010 16:40:29 -0400
> 
> > Yet another batch intended for 2.6.36...  Mostly the usual random lot
> > of stuff, mostly driver updates.  This batch also includes a flurry
> > of Sparse-inspired patches from me -- it is hard to resist once the
> > "bug" bites!  As usual, all of these have been cooking in linux-next
> > for at least several days.
> > 
> > Please let me know if there are problems!
> 
> Auto-merging drivers/net/wireless/iwlwifi/iwl-commands.h
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-commands.h
> 
> I don't even have to look at the file to know that it's
> another one of those __packed things.
> 
> I'll fix it up again, but I know you can sense how tiring
> this has become for me.

I'm sorry, Dave!  I should have done a for-davem branch.  FWIW,
I intended to do a test merge but it must have slipped my fragile
mind. :-(

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply

* Re: pull request: wireless-next-2.6 2010-07-23
From: David Miller @ 2010-07-23 21:03 UTC (permalink / raw)
  To: linville-2XuSBdqkA4R54TAoqtyWWQ
  Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <20100723204029.GD2426-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>

From: "John W. Linville" <linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org>
Date: Fri, 23 Jul 2010 16:40:29 -0400

> Yet another batch intended for 2.6.36...  Mostly the usual random lot
> of stuff, mostly driver updates.  This batch also includes a flurry
> of Sparse-inspired patches from me -- it is hard to resist once the
> "bug" bites!  As usual, all of these have been cooking in linux-next
> for at least several days.
> 
> Please let me know if there are problems!

Auto-merging drivers/net/wireless/iwlwifi/iwl-commands.h
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-commands.h

I don't even have to look at the file to know that it's
another one of those __packed things.

I'll fix it up again, but I know you can sense how tiring
this has become for me.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply

* pull request: wireless-next-2.6 2010-07-23
From: John W. Linville @ 2010-07-23 20:40 UTC (permalink / raw)
  To: davem-fT/PcQaiUtIeIZ0/mPfg9Q
  Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netdev-u79uwXL29TY76Z2rM5mHXA

Dave,

Yet another batch intended for 2.6.36...  Mostly the usual random lot
of stuff, mostly driver updates.  This batch also includes a flurry
of Sparse-inspired patches from me -- it is hard to resist once the
"bug" bites!  As usual, all of these have been cooking in linux-next
for at least several days.

Please let me know if there are problems!

Thanks,

John

---

The following changes since commit e955cead031177b083fbf18d04a03c06e330a439:

  CAN: Add Flexcan CAN controller driver (2010-07-22 18:06:25 +0200)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master

Bob Copeland (2):
      ath5k: move reset to mac80211 workqueue
      ath5k: disable tasklets during reset

Bruno Randolf (1):
      ath5k: clean up rxlink handling

Christian Lamparter (1):
      mac80211: skip HT parsing if HW does not support HT

Dan Carpenter (1):
      orinoco_usb: potential null dereference

David Gnedt (1):
      mac80211: set carrier on for monitor interfaces on ieee80211_open

Felix Fietkau (3):
      ath9k: another fix for the A-MPDU buffer leak
      ath9k_hw: remove initvals for hardware which was never sold
      mac80211: fix aggregation action frame handling with AP VLANs

Joe Perches (1):
      drivers/net/wireless: Remove unnecessary casts of private_data

Johannes Berg (5):
      cfg80211: don't get expired BSSes
      mac80211: move QoS-enable to BSS info
      mac80211: refuse shared key auth when WEP is unavailable
      mac80211: fix IBSS lockdep complaint
      mac80211: proper IBSS locking

John W. Linville (16):
      libertas: convert new uses of __attribute__ ((packed)) to __packed
      iwlwifi: convert new uses of __attribute__ ((packed)) to __packed
      mac80211: improve error checking if WEP fails to init
      wireless: only use alpha2 regulatory information from country IE
      wireless: correct sparse warning in lib80211_crypt_tkip.c
      wireless: correct sparse warning in wext-compat.c
      wireless: correct sparse warning in generated regdb.c
      wireless: mark cfg80211_is_all_idle as static
      ath9k: correct sparse identified endian bug in ath_paprd_calibrate
      ipw2100: mark ipw2100_pm_qos_req static
      libipw: correct sparse warnings and mark some variables static
      rt2x00: correct sparse warning in rt2x00debug.c
      wireless: remove unnecessary reg_same_country_ie_hint
      mwl8k: correct/silence sparse warnings
      rtl8180: improve signal reporting for rtl8185 hardware
      b43: silence most sparse warnings

Kulikov Vasiliy (1):
      wireless: airo: delete netdev from list after it is freed

Larry Finger (1):
      b43: silence phy_n sparse warnings

Luis R. Rodriguez (2):
      ath9k_htc: make ath9k_htc_tx_aggr_oper() static
      ath9k_hw: Fix AR9003 MPDU delimeter CRC check for middle subframes

Maxime Bizon (1):
      cfg80211: fix race between sysfs and cfg80211

Pavel Roskin (1):
      ath9k: remove unneeded calculation of minimal calibration power

Rajkumar Manoharan (1):
      ath9k: fix panic while cleaning up virtaul wifis

Vivek Natarajan (1):
      ath9k: Fix the LED behaviour in idle unassociated state.

Wey-Yi Guy (3):
      iwlwifi: additional statistic debug counter
      iwlwifi: more statistics counter for agn in debugfs
      iwlwifi: "recover_from_tx_stall" function for 4965

 drivers/net/wireless/airo.c                      |   24 +-
 drivers/net/wireless/ath/ath5k/base.c            |   65 +-
 drivers/net/wireless/ath/ath5k/base.h            |    4 +-
 drivers/net/wireless/ath/ath5k/debug.c           |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c       |   66 -
 drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 4141 ++++++----------------
 drivers/net/wireless/ath/ath9k/ar9003_mac.c      |   31 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c       |    7 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c     |    4 -
 drivers/net/wireless/ath/ath9k/eeprom_def.c      |    7 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c    |   18 +-
 drivers/net/wireless/ath/ath9k/init.c            |    2 +-
 drivers/net/wireless/ath/ath9k/main.c            |   21 +-
 drivers/net/wireless/ath/ath9k/xmit.c            |   19 +-
 drivers/net/wireless/b43/main.c                  |    2 +-
 drivers/net/wireless/b43/phy_g.c                 |    2 +-
 drivers/net/wireless/b43/phy_lp.c                |    8 +-
 drivers/net/wireless/b43/phy_n.c                 |   16 +-
 drivers/net/wireless/b43/wa.c                    |    8 +-
 drivers/net/wireless/ipw2x00/ipw2100.c           |    2 +-
 drivers/net/wireless/ipw2x00/libipw_module.c     |    4 +-
 drivers/net/wireless/ipw2x00/libipw_wx.c         |    4 -
 drivers/net/wireless/iwlwifi/iwl-4965.c          |    1 +
 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c   |    7 +
 drivers/net/wireless/iwlwifi/iwl-commands.h      |    7 +-
 drivers/net/wireless/iwlwifi/iwl-core.c          |   18 +-
 drivers/net/wireless/iwlwifi/iwl-debugfs.c       |   10 +-
 drivers/net/wireless/libertas/cfg.c              |    6 +-
 drivers/net/wireless/libertas/debugfs.c          |    4 +-
 drivers/net/wireless/libertas/host.h             |    6 +-
 drivers/net/wireless/mwl8k.c                     |   22 +-
 drivers/net/wireless/orinoco/orinoco_usb.c       |   10 +-
 drivers/net/wireless/rt2x00/rt2x00dump.h         |    2 +-
 drivers/net/wireless/rtl818x/rtl8180_dev.c       |   11 +-
 include/net/cfg80211.h                           |    4 +
 include/net/mac80211.h                           |   11 +-
 include/net/regulatory.h                         |    1 -
 net/mac80211/cfg.c                               |    4 -
 net/mac80211/ht.c                                |    2 +-
 net/mac80211/ibss.c                              |   92 +-
 net/mac80211/ieee80211_i.h                       |    7 +-
 net/mac80211/iface.c                             |    6 +-
 net/mac80211/mlme.c                              |   13 +-
 net/mac80211/util.c                              |    7 +-
 net/mac80211/wep.c                               |    5 +-
 net/wireless/core.c                              |   14 +-
 net/wireless/genregdb.awk                        |    1 +
 net/wireless/lib80211_crypt_tkip.c               |    2 +-
 net/wireless/reg.c                               |  654 +----
 net/wireless/scan.c                              |    5 +
 net/wireless/sme.c                               |    2 +-
 net/wireless/wext-compat.c                       |    1 +
 52 files changed, 1405 insertions(+), 3987 deletions(-)

Omnibus patch available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6-2010-07-23.patch.bz2

-- 
John W. Linville		Someday the world will need a hero, and you
linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply

* Re: [PATCH net-next-2.6] bonding: set device in RLB ARP packet handler
From: Andy Gospodarek @ 2010-07-23 20:26 UTC (permalink / raw)
  To: Jay Vosburgh
  Cc: Greg Edwards, netdev, David S. Miller, bonding-devel,
	linux-kernel
In-Reply-To: <28252.1279915324@death>

On Fri, Jul 23, 2010 at 01:02:04PM -0700, Jay Vosburgh wrote:
> 
> From: Greg Edwards <greg.edwards@hp.com>
> 
> After:
> 
> commit 6146b1a4da98377e4abddc91ba5856bef8f23f1e
> Author: Jay Vosburgh <fubar@us.ibm.com>
> Date:   Tue Nov 4 17:51:15 2008 -0800
> 
>     bonding: Fix ALB mode to balance traffic on VLANs
> 
> the dev field in the RLB ARP packet handler was set to NULL to wildcard
> and accommodate balancing VLANs on top of bonds.
> 
> This has the side-effect of the packet handler being called against
> other, non RLB-enabled bonds, and a kernel oops results when it tries to
> dereference rx_hashtbl in rlb_update_entry_from_arp(), which won't be
> set for those bonds, e.g. active-backup.
> 
> With the __netif_receive_skb() changes from:
> 
> commit 1f3c8804acba841b5573b953f5560d2683d2db0d
> Author: Andy Gospodarek <andy@greyhouse.net>
> Date:   Mon Dec 14 10:48:58 2009 +0000
> 
>     bonding: allow arp_ip_targets on separate vlans to use arp validation
> 
> frames received on VLANs correctly make their way to the bond's handler,
> so we no longer need to wildcard the device.
> 
> The oops can be reproduced by:
> 
> modprobe bonding
> 
> echo active-backup > /sys/class/net/bond0/bonding/mode
> echo 100 > /sys/class/net/bond0/bonding/miimon
> ifconfig bond0 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
> echo +eth0 > /sys/class/net/bond0/bonding/slaves
> echo +eth1 > /sys/class/net/bond0/bonding/slaves
> 
> echo +bond1 > /sys/class/net/bonding_masters
> echo balance-alb > /sys/class/net/bond1/bonding/mode
> echo 100 > /sys/class/net/bond1/bonding/miimon
> ifconfig bond1 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
> echo +eth2 > /sys/class/net/bond1/bonding/slaves
> echo +eth3 > /sys/class/net/bond1/bonding/slaves
> 
> Pass some traffic on bond0.  Boom.
> 
> [ Tested, behaves as advertised.  I do not believe a test of the bonding
> mode is necessary, as there is no race between the packet handler and
> the bonding mode changing (the mode can only change when the device is
> closed).  Also updated the log message to include the reproduction and
> full commit ids.  -J ]
> 	
> Signed-off-by: Greg Edwards <greg.edwards@hp.com>
> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>

Acked-by: Andy Gospodarek <andy@greyhouse.net>

> 
> ---
> 
>  drivers/net/bonding/bond_alb.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
> index df48307..8d7dfd2 100644
> --- a/drivers/net/bonding/bond_alb.c
> +++ b/drivers/net/bonding/bond_alb.c
> @@ -822,7 +822,7 @@ static int rlb_initialize(struct bonding *bond)
> 
>  	/*initialize packet type*/
>  	pk_type->type = cpu_to_be16(ETH_P_ARP);
> -	pk_type->dev = NULL;
> +	pk_type->dev = bond->dev;
>  	pk_type->func = rlb_arp_recv;
> 
>  	/* register to receive ARPs */
> -- 
> 1.7.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply

* Re: [PATCH] bonding: set device in RLB ARP packet handler
From: Andy Gospodarek @ 2010-07-23 20:25 UTC (permalink / raw)
  To: Greg Edwards
  Cc: Andy Gospodarek, Jay Vosburgh,
	bonding-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org
In-Reply-To: <20100723195947.GA7123@w-gedwards.lhn.com>

On Fri, Jul 23, 2010 at 01:59:47PM -0600, Greg Edwards wrote:
> On Fri, Jul 23, 2010 at 07:34:56PM +0000, Andy Gospodarek wrote:
> > On Thu, Jul 22, 2010 at 3:52 PM, Greg Edwards <greg.edwards@hp.com> wrote:
> >> With commit 6146b1a4, the dev field in the RLB ARP packet handler was
> >> set to NULL to wildcard and accommodate balancing VLANs on top of
> >> bonds.
> >>
> >> This has the side-effect of the packet handler being called against
> >> other, non RLB-enabled bonds, and a kernel oops results when it tries
> >> to
> >> dereference rx_hashtbl in rlb_update_entry_from_arp(), which won't be
> >> set for those bonds, e.g. active-backup.
> >>
> >> With the __netif_receive_skb() changes from commit 1f3c8804, frames
> >> received on VLANs correctly make their way to the bond's handler,
> >> so we no longer need to wildcard the device.
> >
> > I see this problem as well, but I would propose to fix it another way to
> > not alter the receive path so close to the release of 2.6.35 and to
> > catch this for 802.3ad bonds as well.
> 
> Is the problem demonstrable with 802.3ad bonds?  bond_register_lacpdu()
> sets pk_type->dev = bond->dev.
> 

Doh!  You are right.

Plus Jay just posted your patch again, so we can go with that solution.

> >> Signed-off-by: Greg Edwards <greg.edwards@hp.com>
> >> ---
> >> Jay,
> >>
> >> The oops can be reproduced by:
> >>
> >> modprobe bonding
> >>
> >> echo active-backup > /sys/class/net/bond0/bonding/mode
> >> echo 100 > /sys/class/net/bond0/bonding/miimon
> >> ifconfig bond0 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
> >> echo +eth0 > /sys/class/net/bond0/bonding/slaves
> >> echo +eth1 > /sys/class/net/bond0/bonding/slaves
> >>
> >> echo +bond1 > /sys/class/net/bonding_masters
> >> echo balance-alb > /sys/class/net/bond1/bonding/mode
> >> echo 100 > /sys/class/net/bond1/bonding/miimon
> >> ifconfig bond1 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
> >> echo +eth2 > /sys/class/net/bond1/bonding/slaves
> >> echo +eth3 > /sys/class/net/bond1/bonding/slaves
> >>
> >> Pass some traffic on bond0.  Boom.
> >>
> >
> > bonding: make sure mode-specific handlers handle appropriate frames
> >
> > This patch will exit out of rlb_arp_recv and bond_3ad_lacpdu_recv early
> > if the bond receiving the frame isn't using that mode.
> 
> I had originally thought of doing something like this, but it didn't
> seem as clean.  I don't have strong feelings one way or the other,
> though.
> 
> Greg
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply

* Re: [PATCH] iproute2: Add dsfield as alias for tos for ip rules
From: Stephen Hemminger @ 2010-07-23 20:22 UTC (permalink / raw)
  To: Arnd Hannemann; +Cc: shemminger, netdev
In-Reply-To: <1274451009-29456-1-git-send-email-hannemann@nets.rwth-aachen.de>

On Fri, 21 May 2010 16:10:09 +0200
Arnd Hannemann <hannemann@nets.rwth-aachen.de> wrote:

> From: Arnd Hannemann <arnd@rhea.(none)>
> 
> Get ip rule parsing of "dsfield" in sync with ip route parsing and manual page.
> 
> Signed-off-by: Arnd Hannemann <hannemann@nets.rwth-aachen.de>
> ---
>  ip/iprule.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/ip/iprule.c b/ip/iprule.c
> index 7140375..cbf8226 100644
> --- a/ip/iprule.c
> +++ b/ip/iprule.c
> @@ -270,7 +270,8 @@ static int iprule_modify(int cmd, int argc, char **argv)
>  			if (get_u32(&pref, *argv, 0))
>  				invarg("preference value is invalid\n", *argv);
>  			addattr32(&req.n, sizeof(req), FRA_PRIORITY, pref);
> -		} else if (strcmp(*argv, "tos") == 0) {
> +		} else if (strcmp(*argv, "tos") == 0 ||
> +			   matches(*argv, "dsfield") == 0) {
>  			__u32 tos;
>  			NEXT_ARG();
>  			if (rtnl_dsfield_a2n(&tos, *argv))

Applied

-- 

^ permalink raw reply

* Re: [PATCH] iproute: fix tc generating ipv6 priority filter
From: Stephen Hemminger @ 2010-07-23 20:21 UTC (permalink / raw)
  To: Petr Lautrbach; +Cc: shemminger, netdev
In-Reply-To: <1276522588-23727-1-git-send-email-plautrba@redhat.com>

On Mon, 14 Jun 2010 15:36:28 +0200
Petr Lautrbach <plautrba@redhat.com> wrote:

> This patch adds ipv6 filter priority/traffic class function 
> static int parse_ip6_class(int *argc_p, char ***argv_p, struct tc_u32_sel *sel) 
> shifting filter value to 5th bit and ignoring "at" as header position 
> is exactly given.
> 
> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
> ---
> Hello,
> 
> According to [1], tc doesn't generate right filters for IPv6 
> "priority".
> 
> Priority or Traffic Classes is 8 bits starting at 5th bit 
> based on RFC 2460 [2]. There is parse_u8(&argc, &argv, sel, 4, 0)
> function used in current version, which shifts filter by 4 bytes 
> instead of 4 bits.
> 
> [1] https://bugzilla.redhat.com/show_bug.cgi?id=584913
> [2] http://www.faqs.org/rfcs/rfc2460.html
> 
>  tc/f_u32.c |   39 ++++++++++++++++++++++++++++++++++++++-
>  1 files changed, 38 insertions(+), 1 deletions(-)
> 
> diff --git a/tc/f_u32.c b/tc/f_u32.c
> index 4f5f74e..31e13b5 100644
> --- a/tc/f_u32.c
> +++ b/tc/f_u32.c
> @@ -403,6 +403,43 @@ static int parse_ip6_addr(int *argc_p, char ***argv_p,
>  	return res;
>  }
>  
> +static int parse_ip6_class(int *argc_p, char ***argv_p, struct tc_u32_sel *sel)
> +{
> +	int res = -1;
> +	int argc = *argc_p;
> +	char **argv = *argv_p;
> +	__u32 key;
> +	__u32 mask;
> +	int off = 0;
> +	int offmask = 0;
> +
> +	if (argc < 2)
> +		return -1;
> +
> +	if (get_u32(&key, *argv, 0))
> +		return -1;
> +	argc--; argv++;
> +
> +	if (get_u32(&mask, *argv, 16))
> +		return -1;
> +	argc--; argv++;
> +
> +	if (key > 0xFF || mask > 0xFF)
> +		return -1;
> +
> +	key <<= 20;
> +	mask <<= 20;
> +	key = htonl(key);
> +	mask = htonl(mask);
> +
> +	if (res = pack_key(sel, key, mask, off, offmask) < 0)
> +		return -1;
> +
> +	*argc_p = argc;
> +	*argv_p = argv;
> +	return 0;
> +}
> +
>  static int parse_ether_addr(int *argc_p, char ***argv_p,
>  			    struct tc_u32_sel *sel, int off)
>  {
> @@ -522,7 +559,7 @@ static int parse_ip6(int *argc_p, char ***argv_p, struct tc_u32_sel *sel)
>  		res = parse_ip6_addr(&argc, &argv, sel, 24);
>  	} else if (strcmp(*argv, "priority") == 0) {
>  		NEXT_ARG();
> -		res = parse_u8(&argc, &argv, sel, 4, 0);
> +		res = parse_ip6_class(&argc, &argv, sel);
>  	} else if (strcmp(*argv, "protocol") == 0) {
>  		NEXT_ARG();
>  		res = parse_u8(&argc, &argv, sel, 6, 0);

Applied

-- 

^ permalink raw reply

* Re: Linux 2.6.35-rc6
From: Rafael J. Wysocki @ 2010-07-23 20:16 UTC (permalink / raw)
  To: Greg KH
  Cc: Stephen Rothwell, Linus Torvalds, Linux Kernel Mailing List,
	Russell King, James Bottomley, David Miller, netdev,
	John W. Linville, Michal Marek, ACPI Devel Maling List
In-Reply-To: <20100723122213.GA689@kroah.com>

On Friday, July 23, 2010, Greg KH wrote:
> On Fri, Jul 23, 2010 at 11:21:42AM +1000, Stephen Rothwell wrote:
> > Hi Linus,
> > 
> > On Thu, 22 Jul 2010 12:26:13 -0700 Linus Torvalds <torvalds@linux-foundation.org> wrote:
> > >
> >  I actually hope/think that this is going to be the last -rc. Things
> > > have been pretty quiet, and while this -rc has more commits than -rc5
> > > had, it's not by a large amount, nor does it look scary to me. So
> > > there doesn't seem to be any point in dragging out the release any
> > > more, unless we find something new that calls for it.
> > 
> > I have no idea how important this stuff is, but I still have the
> > following in linux-next that are (in theory) destined for v2.6.35:
> 
> <snip>
> 
> Yes, there are a few minor USB patches in my tree (minor bugfixes and
> new device ids) that I wanted to send to you, but no need to hold up a
> .35 release.
> 
> We're still working on the network namespace sysfs issues, but if that
> option is disabled, all works fine.  I have 3 tiny patches to work to
> resolve that problem in my tree, I can send them to you tonight if you
> want.
> 
> But even there, nothing that should hold up .35 from release.

There are a few things, including regression fixes, in the ACPI land AFAICS.

Rafael


^ permalink raw reply

* Re: 2.6.35-rc6: Reported regressions from 2.6.34
From: Rafael J. Wysocki @ 2010-07-23 20:09 UTC (permalink / raw)
  To: Larry Finger
  Cc: Linux Kernel Mailing List, Maciej Rutecki, Andrew Morton,
	Linus Torvalds, Kernel Testers List, Network Development,
	Linux ACPI, Linux PM List, Linux SCSI List, Linux Wireless List,
	DRI
In-Reply-To: <4C49A577.3020306@lwfinger.net>

On Friday, July 23, 2010, Larry Finger wrote:
> On 07/23/2010 06:42 AM, Rafael J. Wysocki wrote:
> > This message contains a list of some regressions from 2.6.34,
> > for which there are no fixes in the mainline known to the tracking team.
> > If any of them have been fixed already, please let us know.
> 
> > Bug-Entry	: http://bugzilla.kernel.org/show_bug.cgi?id=16312
> > Subject		: WARNING: at fs/fs-writeback.c:1127 __mark_inode_dirty
> > Submitter	: Zdenek Kabelac<zdenek.kabelac@gmail.com>
> > Date		: 2010-06-28 9:40 (26 days old)
> > Message-ID	:<AANLkTin24fr5O4_q5Xbo9Y_NKkEmtcp6Hgmr9_4qXaFz@mail.gmail.com>
> > References	: http://marc.info/?l=linux-kernel&m=127771804806465&w=2
> 
> I still have this in 2.6.35-rc5.

Thanks for the update.

Rafael

^ permalink raw reply

* Re: [PATCH] net: 3c59x: fix leak of iomaps
From: David Miller @ 2010-07-23 20:06 UTC (permalink / raw)
  To: segooon
  Cc: kernel-janitors, klassert, eric.dumazet, ben, adobriyan, joe,
	netdev
In-Reply-To: <1279903485-28247-1-git-send-email-segooon@gmail.com>

From: Kulikov Vasiliy <segooon@gmail.com>
Date: Fri, 23 Jul 2010 20:44:44 +0400

> If vortex_probe1() fails we should unmap ioaddr mapped earlier.
> 
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>

Applied.  Thanks for following up on this.

^ permalink raw reply

* Re: [PATCH] net: s2io: fix buffer overflow
From: David Miller @ 2010-07-23 20:06 UTC (permalink / raw)
  To: segooon
  Cc: kernel-janitors, ramkrishna.vepa, sivakumar.subramani,
	sreenivasa.honnur, jon.mason, joe, jpirko, netdev
In-Reply-To: <1279902976-27146-1-git-send-email-segooon@gmail.com>

From: Kulikov Vasiliy <segooon@gmail.com>
Date: Fri, 23 Jul 2010 20:36:15 +0400

> vpd_data[] is allocated as kmalloc(256, GFP_KERNEL), so if cnt = 255
> then (cnt + 3) overflows 256. memset() is executed without checking.
> vpd_data[cnt+2] must be less than 256-cnt-2 as the latter is number of
> vpd_data[] elements to copy.
> 
> Do not fill with zero the beginning of nic->serial_num as it will
> be filled with vpd_data[].
> 
> String in product_name[] should be terminated by '\0'.
> 
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>

Applied.

^ permalink raw reply

* Re: [patch -next v2] mv643xx_eth: potential null dereference
From: David Miller @ 2010-07-23 20:05 UTC (permalink / raw)
  To: buytenh; +Cc: error27, joe, jpirko, kirjanov, saeed, netdev, kernel-janitors
In-Reply-To: <20100723111818.GV21121@mail.wantstofly.org>

From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Fri, 23 Jul 2010 13:18:18 +0200

> On Fri, Jul 23, 2010 at 01:05:05PM +0200, Dan Carpenter wrote:
> 
>> We assume that "pd" can be null on the previous line, and throughout the
>> function so we should check it here as well.  This was introduced by
>> 9b2c2ff7a1c0 "mv643xx_eth: use sw csum for big packets"
>> 
>> Signed-off-by: Dan Carpenter <error27@gmail.com>
> 
> Acked-by: Lennert Buytenhek <buytenh@wantstofly.org>

Applied.

^ permalink raw reply

* Re: [PATCH net-next-2.6] 3c59x: Fix call to mdio_sync() with the wrong argument
From: David Miller @ 2010-07-23 20:05 UTC (permalink / raw)
  To: ben; +Cc: netdev, dktrkranz, 589989
In-Reply-To: <1279844308.4883.365.camel@localhost>

From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 23 Jul 2010 01:18:28 +0100

> commit a095cfc40ec7ebe63e9532383c5b5c2a27b14075
> "3c59x: Specify window explicitly for access to windowed registers"
> changed the first parameter to mdio_sync(), from a pointer to the
> register mapping, to a pointer to the vortex_private structure,
> and changed all but one of the call sites.  Fix that last one.
> 
> Reported-by: Luca Falavigna <dktrkranz@debian.org>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Applied.

^ permalink raw reply

* [PATCH net-next-2.6] bonding: set device in RLB ARP packet handler
From: Jay Vosburgh @ 2010-07-23 20:02 UTC (permalink / raw)
  To: Greg Edwards; +Cc: netdev, David S. Miller, bonding-devel, linux-kernel
In-Reply-To: <20100722195240.GA25359@w-gedwards.lhn.com>


From: Greg Edwards <greg.edwards@hp.com>

After:

commit 6146b1a4da98377e4abddc91ba5856bef8f23f1e
Author: Jay Vosburgh <fubar@us.ibm.com>
Date:   Tue Nov 4 17:51:15 2008 -0800

    bonding: Fix ALB mode to balance traffic on VLANs

the dev field in the RLB ARP packet handler was set to NULL to wildcard
and accommodate balancing VLANs on top of bonds.

This has the side-effect of the packet handler being called against
other, non RLB-enabled bonds, and a kernel oops results when it tries to
dereference rx_hashtbl in rlb_update_entry_from_arp(), which won't be
set for those bonds, e.g. active-backup.

With the __netif_receive_skb() changes from:

commit 1f3c8804acba841b5573b953f5560d2683d2db0d
Author: Andy Gospodarek <andy@greyhouse.net>
Date:   Mon Dec 14 10:48:58 2009 +0000

    bonding: allow arp_ip_targets on separate vlans to use arp validation

frames received on VLANs correctly make their way to the bond's handler,
so we no longer need to wildcard the device.

The oops can be reproduced by:

modprobe bonding

echo active-backup > /sys/class/net/bond0/bonding/mode
echo 100 > /sys/class/net/bond0/bonding/miimon
ifconfig bond0 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
echo +eth0 > /sys/class/net/bond0/bonding/slaves
echo +eth1 > /sys/class/net/bond0/bonding/slaves

echo +bond1 > /sys/class/net/bonding_masters
echo balance-alb > /sys/class/net/bond1/bonding/mode
echo 100 > /sys/class/net/bond1/bonding/miimon
ifconfig bond1 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
echo +eth2 > /sys/class/net/bond1/bonding/slaves
echo +eth3 > /sys/class/net/bond1/bonding/slaves

Pass some traffic on bond0.  Boom.

[ Tested, behaves as advertised.  I do not believe a test of the bonding
mode is necessary, as there is no race between the packet handler and
the bonding mode changing (the mode can only change when the device is
closed).  Also updated the log message to include the reproduction and
full commit ids.  -J ]
	
Signed-off-by: Greg Edwards <greg.edwards@hp.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>

---

 drivers/net/bonding/bond_alb.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index df48307..8d7dfd2 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -822,7 +822,7 @@ static int rlb_initialize(struct bonding *bond)

 	/*initialize packet type*/
 	pk_type->type = cpu_to_be16(ETH_P_ARP);
-	pk_type->dev = NULL;
+	pk_type->dev = bond->dev;
 	pk_type->func = rlb_arp_recv;

 	/* register to receive ARPs */
-- 
1.7.0.4

^ permalink raw reply related

* Re: ss -p is much too slow
From: Stephen Hemminger @ 2010-07-23 20:01 UTC (permalink / raw)
  To: David Miller; +Cc: sphink, netdev, stephen.hemminger
In-Reply-To: <20100723.124819.246519789.davem@davemloft.net>

On Fri, 23 Jul 2010 12:48:19 -0700 (PDT)
David Miller <davem@davemloft.net> wrote:

> From: David Miller <davem@davemloft.net>
> Date: Mon, 28 Jun 2010 16:21:39 -0700 (PDT)
> 
> > ss: Avoid quadradic complexity with '-p'
> > 
> > Scan the process list of open sockets once, and store in a hash
> > table to be used by subsequent find_user() calls.
> > 
> > Reported-by: Steve Fink <sphink@gmail.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
> 
> Stephen, please apply this, it fixes the quadratic behavior and
> has been sitting for a month.
> 
> It's in patchwork, just check your todo list.
> 

I saw it but wanted to work out a more general solution,
will apply it next week if mine doesn't work.

^ permalink raw reply

* Re: [PATCH] bonding: set device in RLB ARP packet handler
From: Greg Edwards @ 2010-07-23 19:59 UTC (permalink / raw)
  To: Andy Gospodarek
  Cc: Jay Vosburgh, bonding-devel@lists.sourceforge.net,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org
In-Reply-To: <20100723193456.GS7497@gospo.rdu.redhat.com>

On Fri, Jul 23, 2010 at 07:34:56PM +0000, Andy Gospodarek wrote:
> On Thu, Jul 22, 2010 at 3:52 PM, Greg Edwards <greg.edwards@hp.com> wrote:
>> With commit 6146b1a4, the dev field in the RLB ARP packet handler was
>> set to NULL to wildcard and accommodate balancing VLANs on top of
>> bonds.
>>
>> This has the side-effect of the packet handler being called against
>> other, non RLB-enabled bonds, and a kernel oops results when it tries
>> to
>> dereference rx_hashtbl in rlb_update_entry_from_arp(), which won't be
>> set for those bonds, e.g. active-backup.
>>
>> With the __netif_receive_skb() changes from commit 1f3c8804, frames
>> received on VLANs correctly make their way to the bond's handler,
>> so we no longer need to wildcard the device.
>
> I see this problem as well, but I would propose to fix it another way to
> not alter the receive path so close to the release of 2.6.35 and to
> catch this for 802.3ad bonds as well.

Is the problem demonstrable with 802.3ad bonds?  bond_register_lacpdu()
sets pk_type->dev = bond->dev.

>> Signed-off-by: Greg Edwards <greg.edwards@hp.com>
>> ---
>> Jay,
>>
>> The oops can be reproduced by:
>>
>> modprobe bonding
>>
>> echo active-backup > /sys/class/net/bond0/bonding/mode
>> echo 100 > /sys/class/net/bond0/bonding/miimon
>> ifconfig bond0 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
>> echo +eth0 > /sys/class/net/bond0/bonding/slaves
>> echo +eth1 > /sys/class/net/bond0/bonding/slaves
>>
>> echo +bond1 > /sys/class/net/bonding_masters
>> echo balance-alb > /sys/class/net/bond1/bonding/mode
>> echo 100 > /sys/class/net/bond1/bonding/miimon
>> ifconfig bond1 xxx.xxx.xxx.xxx netmask xxx.xxx.xxx.xxx
>> echo +eth2 > /sys/class/net/bond1/bonding/slaves
>> echo +eth3 > /sys/class/net/bond1/bonding/slaves
>>
>> Pass some traffic on bond0.  Boom.
>>
>
> bonding: make sure mode-specific handlers handle appropriate frames
>
> This patch will exit out of rlb_arp_recv and bond_3ad_lacpdu_recv early
> if the bond receiving the frame isn't using that mode.

I had originally thought of doing something like this, but it didn't
seem as clean.  I don't have strong feelings one way or the other,
though.

Greg

^ permalink raw reply

* Re: [PATCH 5/5] net: core: don't use own hex_to_bin() method
From: David Miller @ 2010-07-23 19:51 UTC (permalink / raw)
  To: andy.shevchenko; +Cc: netdev, linux-kernel
In-Reply-To: <2519848e90eac1857ff7a8399e118980dd0bfbd0.1279890832.git.andy.shevchenko@gmail.com>

From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Fri, 23 Jul 2010 16:18:10 +0300

> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Applied.

^ permalink raw reply

* Re: [PATCH 3/5] usb: usbnet: use newly introduced hex_to_bin()
From: David Miller @ 2010-07-23 19:51 UTC (permalink / raw)
  To: andy.shevchenko; +Cc: netdev, linux-kernel, gregkh, linux-usb
In-Reply-To: <dfeaa560c7a129bd667521be983794a05a12a12e.1279890832.git.andy.shevchenko@gmail.com>

From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Fri, 23 Jul 2010 16:18:08 +0300

> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Applied.

^ permalink raw reply

* Re: [PATCH 2/5] drivers: net: use newly introduced hex_to_bin()
From: David Miller @ 2010-07-23 19:51 UTC (permalink / raw)
  To: andy.shevchenko; +Cc: netdev, linux-kernel
In-Reply-To: <3f9b9040fd8614141d4d7df59fbccf32d50e997d.1279890832.git.andy.shevchenko@gmail.com>

From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Fri, 23 Jul 2010 16:18:07 +0300

> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Applied.

^ permalink raw reply

* Re: [PATCH 1/5] drivers: atm: don't use private copy of hex_to_bin()
From: David Miller @ 2010-07-23 19:51 UTC (permalink / raw)
  To: andy.shevchenko; +Cc: netdev, linux-kernel, chas, linux-atm-general
In-Reply-To: <244718f934418c4a183e91e333de95ed07c501d4.1279890832.git.andy.shevchenko@gmail.com>

From: Andy Shevchenko <andy.shevchenko@gmail.com>
Date: Fri, 23 Jul 2010 16:18:06 +0300

> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Applied.

^ permalink raw reply

* Re: ss -p is much too slow
From: David Miller @ 2010-07-23 19:48 UTC (permalink / raw)
  To: sphink; +Cc: netdev, stephen.hemminger
In-Reply-To: <20100628.162139.59679342.davem@davemloft.net>

From: David Miller <davem@davemloft.net>
Date: Mon, 28 Jun 2010 16:21:39 -0700 (PDT)

> ss: Avoid quadradic complexity with '-p'
> 
> Scan the process list of open sockets once, and store in a hash
> table to be used by subsequent find_user() calls.
> 
> Reported-by: Steve Fink <sphink@gmail.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>

Stephen, please apply this, it fixes the quadratic behavior and
has been sitting for a month.

It's in patchwork, just check your todo list.

Thanks.

^ permalink raw reply

* Re: [PATCH net-next 7/7] be2net: bump the driver version number
From: David Miller @ 2010-07-23 19:44 UTC (permalink / raw)
  To: ajitk; +Cc: netdev
In-Reply-To: <20100723120524.GA25060@serverengines.com>

From: Ajit Khaparde <ajitk@serverengines.com>
Date: Fri, 23 Jul 2010 17:35:36 +0530

> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-next 6/7] be2net: variable name changes
From: David Miller @ 2010-07-23 19:44 UTC (permalink / raw)
  To: ajitk; +Cc: netdev
In-Reply-To: <20100723120441.GA25028@serverengines.com>

From: Ajit Khaparde <ajitk@serverengines.com>
Date: Fri, 23 Jul 2010 17:34:54 +0530

> This patch changes names of some variables.
> 
> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-next 5/7] be2net: supress printing error when mac query fails for VF
From: David Miller @ 2010-07-23 19:44 UTC (permalink / raw)
  To: ajitk; +Cc: netdev
In-Reply-To: <20100723120008.GA24995@serverengines.com>

From: Ajit Khaparde <ajitk@serverengines.com>
Date: Fri, 23 Jul 2010 17:30:24 +0530

> When a virtual function driver in initialized, the network mac
> query command can fail. Skip display of error message in that case.
> 
> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>

Applied.

^ permalink raw reply

* Re: [PATCH net-next 4/7] be2net: code to support tx rate configuration on virtual functions
From: David Miller @ 2010-07-23 19:44 UTC (permalink / raw)
  To: ajitk; +Cc: netdev
In-Reply-To: <20100723115201.GA24975@serverengines.com>

From: Ajit Khaparde <ajitk@serverengines.com>
Date: Fri, 23 Jul 2010 17:22:13 +0530

> 
> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>

Applied, but:

> diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
> index 344e062..32ae324 100644
> --- a/drivers/net/benet/be_cmds.c
> +++ b/drivers/net/benet/be_cmds.c
> @@ -1730,3 +1730,37 @@ err:
...
> +err:
> +	spin_unlock_bh(&adapter->mcc_lock);
> +	return status;
> +}
> +

Adds trailing empty line at EOF, which GIT warns about, so I killed
it when adding this patch to the tree.

^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox