diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:48:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 17:48:32 -0700 |
| commit | fb20871a54961b82d35303b43452928186c1361d (patch) | |
| tree | 1beeb39e45eda1c8b5893090904b583fceeb07ef /drivers/staging/agnx/debug.h | |
| parent | bee89ab228e6f51c4ddd3481b9bd491859a8ee7b (diff) | |
| parent | c7a5d70796379e3d51d0c652fbe1634b81d3bbd5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (342 commits)
Staging: comedi: fix build errors
Staging: udlfb: update to version 0.2.3
Staging: udlfb: fix some sparse warnings.
Staging: udlfb: clean up checkpatch warnings in udlfb.c
Staging: udlfb: clean up checkpatch warnings in udlfb.h
Staging: udlfb: add udlfb driver to build
Staging: add udlfb driver
Staging: pata_rdc: remove pointless comments
Staging: pata_rdc: remove DRIVER macros
Staging: pata_rdc: remove dbgprintf macro
Staging: pata_rdc: remove broken flag
Staging: pata_rdc: fix build warnings
Staging: pata_rdc: use PCI_DEVICE
Staging: pata_rdc: remove function prototypes
Staging: pata_rdc: coding style fixes
Staging: pata_rdc: convert code to work in 2.6.29
Staging: pata_rdc: add driver to the build system
Staging: add pata_rdc driver
Staging: remove obsolete serqt_usb driver
Staging: serqt_usb2 add the driver to the build
...
Diffstat (limited to 'drivers/staging/agnx/debug.h')
| -rw-r--r-- | drivers/staging/agnx/debug.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/agnx/debug.h b/drivers/staging/agnx/debug.h index 761d99c2d3f..7947f327a21 100644 --- a/drivers/staging/agnx/debug.h +++ b/drivers/staging/agnx/debug.h @@ -312,7 +312,6 @@ static inline void dump_ieee80211_hdr(struct ieee80211_hdr *hdr, char *tag) { u16 fctl; int hdrlen; - DECLARE_MAC_BUF(mac); fctl = le16_to_cpu(hdr->frame_control); switch (fctl & IEEE80211_FCTL_FTYPE) { @@ -375,13 +374,13 @@ static inline void dump_ieee80211_hdr(struct ieee80211_hdr *hdr, char *tag) printk("FC=0x%04x DUR=0x%04x", fctl, le16_to_cpu(hdr->duration_id)); if (hdrlen >= 10) - printk(" A1=%s", print_mac(mac, hdr->addr1)); + printk(" A1=%pM", hdr->addr1); if (hdrlen >= 16) - printk(" A2=%s", print_mac(mac, hdr->addr2)); + printk(" A2=%pM", hdr->addr2); if (hdrlen >= 24) - printk(" A3=%s", print_mac(mac, hdr->addr3)); + printk(" A3=%pM", hdr->addr3); if (hdrlen >= 30) - printk(" A4=%s", print_mac(mac, hdr->addr4)); + printk(" A4=%pM", hdr->addr4); printk("\n"); } |