Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304768
b: refs/heads/master
c: e1325ad
h: refs/heads/master
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed May 19, 2012
1 parent ba50af8 commit dff4aec
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: 5db647a3b654916ef672f36698cbb6aef79b6bc3
refs/heads/master: e1325ad19f460031cc6b6ae1a890e0e71cc645e4
12 changes: 6 additions & 6 deletions trunk/drivers/staging/bcm/Adapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@ struct _LEADER {
USHORT PLength;
UCHAR Status;
UCHAR Unused[3];
} __attribute__((packed));
} __packed;
typedef struct _LEADER LEADER, *PLEADER;

struct _PACKETTOSEND {
LEADER Leader;
UCHAR ucPayload;
} __attribute__((packed));
} __packed;
typedef struct _PACKETTOSEND PACKETTOSEND, *PPACKETTOSEND;

struct _CONTROL_PACKET {
PVOID ControlBuff;
UINT ControlBuffLen;
struct _CONTROL_PACKET *next;
} __attribute__((packed));
} __packed;
typedef struct _CONTROL_PACKET CONTROL_PACKET, *PCONTROL_PACKET;

struct link_request {
LEADER Leader;
UCHAR szData[4];
} __attribute__((packed));
} __packed;
typedef struct link_request LINK_REQUEST, *PLINK_REQUEST;

/* classification extension is added */
Expand Down Expand Up @@ -534,14 +534,14 @@ struct _ETH_HEADER_STRUC {
UCHAR au8DestinationAddress[6];
UCHAR au8SourceAddress[6];
USHORT u16Etype;
} __attribute__((packed));
} __packed;
typedef struct _ETH_HEADER_STRUC ETH_HEADER_STRUC, *PETH_HEADER_STRUC;

typedef struct FirmwareInfo {
void __user *pvMappedFirmwareAddress;
ULONG u32FirmwareLength;
ULONG u32StartingAddress;
} __attribute__((packed)) FIRMWARE_INFO, *PFIRMWARE_INFO;
} __packed FIRMWARE_INFO, *PFIRMWARE_INFO;

/* holds the value of net_device structure.. */
extern struct net_device *gblpnetdev;
Expand Down

0 comments on commit dff4aec

Please sign in to comment.