mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
wireless: libertas: print esaped string via %*pE
Instead of custom approach this allows to print escaped strings via recently added kernel extension: %*pE. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: "John W . Linville" <linville@tuxdriver.com> Cc: Johannes Berg <johannes@sipsolutions.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
71dca95d5c
commit
da169607ae
2 changed files with 5 additions and 10 deletions
|
@ -590,7 +590,6 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
|
|||
int chan_no = -1;
|
||||
const u8 *ssid = NULL;
|
||||
u8 ssid_len = 0;
|
||||
DECLARE_SSID_BUF(ssid_buf);
|
||||
|
||||
int len = get_unaligned_le16(pos);
|
||||
pos += 2;
|
||||
|
@ -644,10 +643,8 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
|
|||
struct ieee80211_channel *channel =
|
||||
ieee80211_get_channel(wiphy, freq);
|
||||
|
||||
lbs_deb_scan("scan: %pM, capa %04x, chan %2d, %s, "
|
||||
"%d dBm\n",
|
||||
bssid, capa, chan_no,
|
||||
print_ssid(ssid_buf, ssid, ssid_len),
|
||||
lbs_deb_scan("scan: %pM, capa %04x, chan %2d, %*pE, %d dBm\n",
|
||||
bssid, capa, chan_no, ssid_len, ssid,
|
||||
LBS_SCAN_RSSI_TO_MBM(rssi)/100);
|
||||
|
||||
if (channel &&
|
||||
|
@ -1984,7 +1981,6 @@ static int lbs_join_ibss(struct wiphy *wiphy, struct net_device *dev,
|
|||
struct lbs_private *priv = wiphy_priv(wiphy);
|
||||
int ret = 0;
|
||||
struct cfg80211_bss *bss;
|
||||
DECLARE_SSID_BUF(ssid_buf);
|
||||
|
||||
if (dev == priv->mesh_dev)
|
||||
return -EOPNOTSUPP;
|
||||
|
|
|
@ -93,7 +93,6 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
|
|||
{
|
||||
struct cmd_ds_mesh_config cmd;
|
||||
struct mrvl_meshie *ie;
|
||||
DECLARE_SSID_BUF(ssid);
|
||||
|
||||
memset(&cmd, 0, sizeof(cmd));
|
||||
cmd.channel = cpu_to_le16(chan);
|
||||
|
@ -122,9 +121,9 @@ static int lbs_mesh_config(struct lbs_private *priv, uint16_t action,
|
|||
default:
|
||||
return -1;
|
||||
}
|
||||
lbs_deb_cmd("mesh config action %d type %x channel %d SSID %s\n",
|
||||
action, priv->mesh_tlv, chan,
|
||||
print_ssid(ssid, priv->mesh_ssid, priv->mesh_ssid_len));
|
||||
lbs_deb_cmd("mesh config action %d type %x channel %d SSID %*pE\n",
|
||||
action, priv->mesh_tlv, chan, priv->mesh_ssid_len,
|
||||
priv->mesh_ssid);
|
||||
|
||||
return __lbs_mesh_config_send(priv, &cmd, action, priv->mesh_tlv);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue