lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

Browse Source 
Conflicts:

	drivers/uwb/wlp/eda.c
This commit is contained in:
David Vrabel
2009-01-02 13:17:13 +00:00
parent 3af373021f b58602a4ba
commit b21a207141
5033 changed files with 291865 additions and 134111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/uwb/wlp/eda.c
View File

@@ -351,19 +351,13 @@ ssize_t wlp_eda_show(struct wlp *wlp, char *buf)
"tag state virt_addr\n");
list_for_each_entry(entry, &eda->cache, list_node) {
result += scnprintf(buf + result, PAGE_SIZE - result,
"%02x:%02x:%02x:%02x:%02x:%02x %02x:%02x "
"%p 0x%02x %s "
"%02x:%02x:%02x:%02x:%02x:%02x\n",
entry->eth_addr[0], entry->eth_addr[1],
entry->eth_addr[2], entry->eth_addr[3],
entry->eth_addr[4], entry->eth_addr[5],
"%pM %02x:%02x %p 0x%02x %s %pM\n",
entry->eth_addr,
entry->dev_addr.data[1],
entry->dev_addr.data[0], entry->wss,
entry->tag,
wlp_wss_connect_state_str(entry->state),
entry->virt_addr[0], entry->virt_addr[1],
entry->virt_addr[2], entry->virt_addr[3],
entry->virt_addr[4], entry->virt_addr[5]);
entry->virt_addr);
if (result >= PAGE_SIZE)
break;
}