Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 193781
b: refs/heads/master
c: 583d077
h: refs/heads/master
i:
  193779: 26f3491
v: v3
  • Loading branch information
Frans Pop authored and David S. Miller committed Mar 24, 2010
1 parent 14d4991 commit 21cefb6
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 19299b34b42f4d37be2ce9b411664f37ca10ff61
refs/heads/master: 583d077d35dd8df231c1e391e5406f0faf1a1788
4 changes: 2 additions & 2 deletions trunk/drivers/net/ps3_gelic_net.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ static int gelic_descr_prepare_rx(struct gelic_card *card,
unsigned int bufsize;

if (gelic_descr_get_status(descr) != GELIC_DESCR_DMA_NOT_IN_USE)
dev_info(ctodev(card), "%s: ERROR status \n", __func__);
dev_info(ctodev(card), "%s: ERROR status\n", __func__);
/* we need to round up the buffer size to a multiple of 128 */
bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN);

Expand Down Expand Up @@ -1434,7 +1434,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work)
container_of(work, struct gelic_card, tx_timeout_task);
struct net_device *netdev = card->netdev[GELIC_PORT_ETHERNET_0];

dev_info(ctodev(card), "%s:Timed out. Restarting... \n", __func__);
dev_info(ctodev(card), "%s:Timed out. Restarting...\n", __func__);

if (!(netdev->flags & IFF_UP))
goto out;
Expand Down
34 changes: 17 additions & 17 deletions trunk/drivers/net/ps3_gelic_wireless.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len,
u8 item_len;
u8 item_id;

pr_debug("%s: data=%p len=%ld \n", __func__,
pr_debug("%s: data=%p len=%ld\n", __func__,
data, len);
memset(ie_info, 0, sizeof(struct ie_info));

Expand Down Expand Up @@ -978,15 +978,15 @@ static int gelic_wl_set_essid(struct net_device *netdev,
pr_debug("%s: essid = '%s'\n", __func__, extra);
set_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat);
} else {
pr_debug("%s: ESSID any \n", __func__);
pr_debug("%s: ESSID any\n", __func__);
clear_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat);
}
set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
spin_unlock_irqrestore(&wl->lock, irqflag);


gelic_wl_try_associate(netdev); /* FIXME */
pr_debug("%s: -> \n", __func__);
pr_debug("%s: ->\n", __func__);
return 0;
}

Expand All @@ -997,7 +997,7 @@ static int gelic_wl_get_essid(struct net_device *netdev,
struct gelic_wl_info *wl = port_wl(netdev_priv(netdev));
unsigned long irqflag;

pr_debug("%s: <- \n", __func__);
pr_debug("%s: <-\n", __func__);
mutex_lock(&wl->assoc_stat_lock);
spin_lock_irqsave(&wl->lock, irqflag);
if (test_bit(GELIC_WL_STAT_ESSID_SET, &wl->stat) ||
Expand All @@ -1010,7 +1010,7 @@ static int gelic_wl_get_essid(struct net_device *netdev,

mutex_unlock(&wl->assoc_stat_lock);
spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> len=%d \n", __func__, data->essid.length);
pr_debug("%s: -> len=%d\n", __func__, data->essid.length);

return 0;
}
Expand All @@ -1027,7 +1027,7 @@ static int gelic_wl_set_encode(struct net_device *netdev,
int key_index, index_specified;
int ret = 0;

pr_debug("%s: <- \n", __func__);
pr_debug("%s: <-\n", __func__);
flags = enc->flags & IW_ENCODE_FLAGS;
key_index = enc->flags & IW_ENCODE_INDEX;

Expand Down Expand Up @@ -1086,7 +1086,7 @@ static int gelic_wl_set_encode(struct net_device *netdev,
set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
done:
spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> \n", __func__);
pr_debug("%s: ->\n", __func__);
return ret;
}

Expand All @@ -1100,7 +1100,7 @@ static int gelic_wl_get_encode(struct net_device *netdev,
unsigned int key_index, index_specified;
int ret = 0;

pr_debug("%s: <- \n", __func__);
pr_debug("%s: <-\n", __func__);
key_index = enc->flags & IW_ENCODE_INDEX;
pr_debug("%s: flag=%#x point=%p len=%d extra=%p\n", __func__,
enc->flags, enc->pointer, enc->length, extra);
Expand Down Expand Up @@ -1214,7 +1214,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev,
int key_index;
int ret = 0;

pr_debug("%s: <- \n", __func__);
pr_debug("%s: <-\n", __func__);
flags = enc->flags & IW_ENCODE_FLAGS;
alg = ext->alg;
key_index = enc->flags & IW_ENCODE_INDEX;
Expand Down Expand Up @@ -1287,7 +1287,7 @@ static int gelic_wl_set_encodeext(struct net_device *netdev,
}
done:
spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> \n", __func__);
pr_debug("%s: ->\n", __func__);
return ret;
}

Expand All @@ -1303,7 +1303,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev,
int ret = 0;
int max_key_len;

pr_debug("%s: <- \n", __func__);
pr_debug("%s: <-\n", __func__);

max_key_len = enc->length - sizeof(struct iw_encode_ext);
if (max_key_len < 0)
Expand Down Expand Up @@ -1358,7 +1358,7 @@ static int gelic_wl_get_encodeext(struct net_device *netdev,
}
out:
spin_unlock_irqrestore(&wl->lock, irqflag);
pr_debug("%s: -> \n", __func__);
pr_debug("%s: ->\n", __func__);
return ret;
}
/* SIOC{S,G}IWMODE */
Expand All @@ -1369,7 +1369,7 @@ static int gelic_wl_set_mode(struct net_device *netdev,
__u32 mode = data->mode;
int ret;

pr_debug("%s: <- \n", __func__);
pr_debug("%s: <-\n", __func__);
if (mode == IW_MODE_INFRA)
ret = 0;
else
Expand All @@ -1383,7 +1383,7 @@ static int gelic_wl_get_mode(struct net_device *netdev,
union iwreq_data *data, char *extra)
{
__u32 *mode = &data->mode;
pr_debug("%s: <- \n", __func__);
pr_debug("%s: <-\n", __func__);
*mode = IW_MODE_INFRA;
pr_debug("%s: ->\n", __func__);
return 0;
Expand Down Expand Up @@ -2021,7 +2021,7 @@ static int gelic_wl_associate_bss(struct gelic_wl_info *wl,

if (!rc) {
/* timeouted. Maybe key or cyrpt mode is wrong */
pr_info("%s: connect timeout \n", __func__);
pr_info("%s: connect timeout\n", __func__);
cmd = gelic_eurus_sync_cmd(wl, GELIC_EURUS_CMD_DISASSOC,
NULL, 0);
kfree(cmd);
Expand Down Expand Up @@ -2062,7 +2062,7 @@ static void gelic_wl_connected_event(struct gelic_wl_info *wl,
}

if (desired_event == event) {
pr_debug("%s: completed \n", __func__);
pr_debug("%s: completed\n", __func__);
complete(&wl->assoc_done);
netif_carrier_on(port_to_netdev(wl_port(wl)));
} else
Expand Down Expand Up @@ -2317,7 +2317,7 @@ static struct net_device * __devinit gelic_wl_alloc(struct gelic_card *card)
pr_debug("%s:start\n", __func__);
netdev = alloc_etherdev(sizeof(struct gelic_port) +
sizeof(struct gelic_wl_info));
pr_debug("%s: netdev =%p card=%p \np", __func__, netdev, card);
pr_debug("%s: netdev =%p card=%p\n", __func__, netdev, card);
if (!netdev)
return NULL;

Expand Down

0 comments on commit 21cefb6

Please sign in to comment.