From patchwork Tue Jul 13 03:22:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan Wu X-Patchwork-Id: 58700 X-Patchwork-Delegate: tim.gardner@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id A7D44B6EEB for ; Tue, 13 Jul 2010 13:23:51 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OYW5z-00026G-5V; Tue, 13 Jul 2010 04:23:47 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OYW5x-00025p-GS for kernel-team@lists.ubuntu.com; Tue, 13 Jul 2010 04:23:45 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OYW5x-0003MS-Ai for ; Tue, 13 Jul 2010 04:23:45 +0100 Received: from [58.33.190.89] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1OYW5v-0006F7-88 for kernel-team@lists.ubuntu.com; Tue, 13 Jul 2010 04:23:45 +0100 From: Bryan Wu To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] UBUNTU: SAUCE: smsc95xx: fix macaddr parameter parsing Date: Tue, 13 Jul 2010 11:22:48 +0800 Message-Id: <1278991369-17962-3-git-send-email-bryan.wu@canonical.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1278991369-17962-1-git-send-email-bryan.wu@canonical.com> References: <1278991369-17962-1-git-send-email-bryan.wu@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Sebastien Jan Depending on the position of the macaddr parameter in the command line, it could be badly interpreted and discarded. Signed-off-by: Sebastien Jan Acked-by: Bryan Wu --- drivers/net/usb/smsc95xx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 0ba06d9..8a4d92b 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -677,7 +677,7 @@ static int smsc95xx_is_macaddr_param(struct usbnet *dev, u8 *dev_mac) } } - if (j == MAC_ADDR_LEN && !macaddr[i]) { + if (j == MAC_ADDR_LEN) { netif_dbg(dev, ifup, dev->net, "Overriding MAC address with: " "%02x:%02x:%02x:%02x:%02x:%02x\n", mtbl[0], mtbl[1], mtbl[2], mtbl[3], mtbl[4], mtbl[5]);