diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/vt6655/tether.h | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/vt6655/tether.h')
| -rw-r--r-- | drivers/staging/vt6655/tether.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/drivers/staging/vt6655/tether.h b/drivers/staging/vt6655/tether.h index 920a8bb68356..5a3c326436c6 100644 --- a/drivers/staging/vt6655/tether.h +++ b/drivers/staging/vt6655/tether.h @@ -26,18 +26,10 @@ * */ - - #ifndef __TETHER_H__ #define __TETHER_H__ - -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - /*--------------------- Export Definitions -------------------------*/ // @@ -179,7 +171,7 @@ typedef struct tagSEthernetHeader { BYTE abySrcAddr[U_ETHER_ADDR_LEN]; WORD wType; }__attribute__ ((__packed__)) -SEthernetHeader, DEF* PSEthernetHeader; +SEthernetHeader, *PSEthernetHeader; // @@ -190,7 +182,7 @@ typedef struct tagS802_3Header { BYTE abySrcAddr[U_ETHER_ADDR_LEN]; WORD wLen; }__attribute__ ((__packed__)) -S802_3Header, DEF* PS802_3Header; +S802_3Header, *PS802_3Header; // // 802_11 packet @@ -204,7 +196,7 @@ typedef struct tagS802_11Header { WORD wSeqCtl; BYTE abyAddr4[U_ETHER_ADDR_LEN]; }__attribute__ ((__packed__)) -S802_11Header, DEF* PS802_11Header; +S802_11Header, *PS802_11Header; /*--------------------- Export Macros ------------------------------*/ // Frame type macro @@ -233,23 +225,11 @@ S802_11Header, DEF* PS802_11Header; /*--------------------- Export Variables --------------------------*/ /*--------------------- Export Functions --------------------------*/ -#ifdef __cplusplus -extern "C" { /* Assume C declarations for C++ */ -#endif /* __cplusplus */ - BYTE ETHbyGetHashIndexByCrc32(PBYTE pbyMultiAddr); //BYTE ETHbyGetHashIndexByCrc(PBYTE pbyMultiAddr); BOOL ETHbIsBufferCrc32Ok(PBYTE pbyBuffer, UINT cbFrameLength); - -#ifdef __cplusplus -} /* End of extern "C" { */ -#endif /* __cplusplus */ - - - - #endif // __TETHER_H__ |