aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-29 11:02:08 -0400
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-10-29 23:43:32 -0400
commit5abe61ade9a137b35aa29919334dde7f3a30b248 (patch)
treeea3bc159adb169fe75bfb4a9d0b27f790ea9de24 /drivers/staging/bcm
parent91d29ee1a82fedcd7d1bbf24007b31a49c47e90a (diff)
beceem: remove version ifdef's
Remove code to support older kernel API's Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/Macros.h31
1 files changed, 1 insertions, 30 deletions
diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index 5485f574b91..3868e5b9444 100644
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -4,10 +4,6 @@
4#ifndef __MACROS_H__ 4#ifndef __MACROS_H__
5#define __MACROS_H__ 5#define __MACROS_H__
6 6
7#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
8#define kthread_run(threadfn,data,datafmt)(struct task_struct *)kernel_thread(threadfn,data,0)
9#endif
10
11#define TX_TIMER_PERIOD 10 //10 msec 7#define TX_TIMER_PERIOD 10 //10 msec
12#define MAX_CLASSIFIERS 100 8#define MAX_CLASSIFIERS 100
13//#define MAX_CLASSIFIERS_PER_SF 20 9//#define MAX_CLASSIFIERS_PER_SF 20
@@ -350,12 +346,7 @@ typedef enum ePMU_MODES
350 HYBRID_MODE_6 = 2 346 HYBRID_MODE_6 = 2
351}PMU_MODE; 347}PMU_MODE;
352 348
353#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
354#define MAX_RDM_WRM_RETIRES 16
355#else
356#define MAX_RDM_WRM_RETIRES 1 349#define MAX_RDM_WRM_RETIRES 1
357#endif
358
359 350
360enum eAbortPattern { 351enum eAbortPattern {
361 ABORT_SHUTDOWN_MODE = 1, 352 ABORT_SHUTDOWN_MODE = 1,
@@ -364,27 +355,7 @@ enum eAbortPattern {
364 ABORT_IDLE_SYNCDOWN = 3 355 ABORT_IDLE_SYNCDOWN = 3
365}; 356};
366 357
367#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) 358#define GET_BCM_ADAPTER(net_dev) (net_dev ? netdev_priv(net_dev) : NULL)
368 #define GET_BCM_ADAPTER(net_dev) ({\
369 PMINI_ADAPTER __Adapter = NULL; \
370 if (net_dev) { \
371 __Adapter = (PMINI_ADAPTER)(net_dev->priv); \
372 } \
373 else { \
374 __Adapter = NULL; \
375 }__Adapter;} )
376#else
377 #define GET_BCM_ADAPTER(net_dev) ({\
378 PMINI_ADAPTER __Adapter = NULL; \
379 if (net_dev) { \
380 __Adapter = (PMINI_ADAPTER)(*((unsigned long *)netdev_priv(net_dev))); \
381 } \
382 else { \
383 __Adapter = NULL; \
384 }__Adapter;})
385
386
387#endif
388 359
389/* Offsets used by driver in skb cb variable */ 360/* Offsets used by driver in skb cb variable */
390#define SKB_CB_CLASSIFICATION_OFFSET 0 361#define SKB_CB_CLASSIFICATION_OFFSET 0