Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325227
b: refs/heads/master
c: 0d66002
h: refs/heads/master
i:
  325225: 983f37f
  325223: 442dcce
v: v3
  • Loading branch information
Macpaul Lin authored and Greg Kroah-Hartman committed Sep 12, 2012
1 parent 574d530 commit 2c4cadd
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6b2a7e0c9bcc0a4df385d1ef8fe5109cea0260e2
refs/heads/master: 0d660025564343e7c20c096d386f8ef8bacebdcd
10 changes: 5 additions & 5 deletions trunk/drivers/staging/gdm72xx/gdm_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@

MODULE_DEVICE_TABLE(usb, id_table);

#define TX_BUF_SIZE 2048
#define TX_BUF_SIZE 2048
#if defined(CONFIG_WIMAX_GDM72XX_WIMAX2)
#define RX_BUF_SIZE (128*1024) /* For packet aggregation */
#define RX_BUF_SIZE (128*1024) /* For packet aggregation */
#else
#define RX_BUF_SIZE 2048
#define RX_BUF_SIZE 2048
#endif

#define GDM7205_PADDING 256
Expand All @@ -39,7 +39,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
#define B2H(x) __be16_to_cpu(x)
#define DB2H(x) __be32_to_cpu(x)

#define DOWNLOAD_CONF_VALUE 0x21
#define DOWNLOAD_CONF_VALUE 0x21

#ifdef CONFIG_WIMAX_GDM72XX_K_MODE

Expand All @@ -48,7 +48,7 @@ static LIST_HEAD(k_list);
static DEFINE_SPINLOCK(k_lock);
static int k_mode_stop;

#define K_WAIT_TIME (2 * HZ / 100)
#define K_WAIT_TIME (2 * HZ / 100)

#endif /* CONFIG_WIMAX_GDM72XX_K_MODE */

Expand Down
16 changes: 8 additions & 8 deletions trunk/drivers/staging/gdm72xx/gdm_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <linux/usb.h>
#include <linux/list.h>

#define B_DIFF_DL_DRV (1<<4)
#define B_DOWNLOAD (1 << 5)
#define B_DIFF_DL_DRV (1 << 4)
#define B_DOWNLOAD (1 << 5)
#define MAX_NR_SDU_BUF 64

struct usb_tx {
Expand All @@ -29,7 +29,7 @@ struct usb_tx {
#endif
struct tx_cxt *tx_cxt;

struct urb *urb;
struct urb *urb;
u8 *buf;

void (*callback)(void *cb_data);
Expand All @@ -44,14 +44,14 @@ struct tx_cxt {
struct list_head pending_list;
#endif

spinlock_t lock;
spinlock_t lock;
};

struct usb_rx {
struct list_head list;
struct rx_cxt *rx_cxt;

struct urb *urb;
struct urb *urb;
u8 *buf;

void (*callback)(void *cb_data, void *data, int len);
Expand All @@ -61,7 +61,7 @@ struct usb_rx {
struct rx_cxt {
struct list_head free_list;
struct list_head used_list;
spinlock_t lock;
spinlock_t lock;
};

struct usbwm_dev {
Expand All @@ -76,8 +76,8 @@ struct usbwm_dev {
struct list_head list;
#endif

struct tx_cxt tx;
struct rx_cxt rx;
struct tx_cxt tx;
struct rx_cxt rx;

int padding;
};
Expand Down

0 comments on commit 2c4cadd

Please sign in to comment.