From patchwork Thu Oct 7 11:11:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 237991 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o97BAhvl025029 for ; Thu, 7 Oct 2010 11:11:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760282Ab0JGLLW (ORCPT ); Thu, 7 Oct 2010 07:11:22 -0400 Received: from he.sipsolutions.net ([78.46.109.217]:36182 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751690Ab0JGLLV (ORCPT ); Thu, 7 Oct 2010 07:11:21 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1P3oNc-00039j-Uh; Thu, 07 Oct 2010 13:11:21 +0200 Subject: [PATCH] cfg80211: constify WDS address From: Johannes Berg To: John Linville Cc: linux-wireless , Bill Jordan Date: Thu, 07 Oct 2010 13:11:09 +0200 Message-ID: <1286449869.3657.40.camel@jlt3.sipsolutions.net> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 07 Oct 2010 11:11:23 +0000 (UTC) --- wireless-testing.orig/include/net/cfg80211.h 2010-10-07 13:07:06.000000000 +0200 +++ wireless-testing/include/net/cfg80211.h 2010-10-07 13:07:31.000000000 +0200 @@ -1229,7 +1229,7 @@ struct cfg80211_ops { int (*get_tx_power)(struct wiphy *wiphy, int *dbm); int (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev, - u8 *addr); + const u8 *addr); void (*rfkill_poll)(struct wiphy *wiphy); --- wireless-testing.orig/net/mac80211/cfg.c 2010-10-07 13:07:06.000000000 +0200 +++ wireless-testing/net/mac80211/cfg.c 2010-10-07 13:07:31.000000000 +0200 @@ -1363,7 +1363,7 @@ static int ieee80211_get_tx_power(struct } static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, - u8 *addr) + const u8 *addr) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); --- wireless-testing.orig/net/wireless/nl80211.c 2010-10-07 13:07:19.000000000 +0200 +++ wireless-testing/net/wireless/nl80211.c 2010-10-07 13:07:31.000000000 +0200 @@ -879,7 +879,7 @@ static int nl80211_set_wds_peer(struct s struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; - u8 *bssid; + const u8 *bssid; if (!info->attrs[NL80211_ATTR_MAC]) return -EINVAL;