Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Browse files Browse the repository at this point in the history 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits)
  [NET] ifb: set separate lockdep classes for queue locks
  [IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
  [TCP]: Fix shrinking windows with window scaling
  netpoll: zap_completion_queue: adjust skb->users counter
  bridge: use time_before() in br_fdb_cleanup()
  [TG3]: Fix build warning on sparc32.
  MAINTAINERS: bluez-devel is subscribers-only
  audit: netlink socket can be auto-bound to pid other than current->pid (v2)
  [NET]: Fix permissions of /proc/net
  [SCTP]: Fix a race between module load and protosw access
  [NETFILTER]: ipt_recent: sanity check hit count
  [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup()
  [RT2X00] drivers/net/wireless/rt2x00/rt2x00dev.c: remove dead code, fix warning
  [IPV4]: esp_output() misannotations
  [8021Q]: vlan_dev misannotations
  xfrm: ->eth_proto is __be16
  [IPV4]: ipv4_is_lbcast() misannotations
  [SUNRPC]: net/* NULL noise
  [SCTP]: fix misannotated __sctp_rcv_asconf_lookup()
  [PKT_SCHED]: annotate cls_u32
  ...
  • Loading branch information
Linus Torvalds committed Mar 21, 2008
2 parents 2c78719 + 94833df commit 7d3628b
Show file tree
Hide file tree
Showing 57 changed files with 651 additions and 391 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ P: Marcel Holtmann
M: marcel@holtmann.org
P: Maxim Krasnyansky
M: maxk@qualcomm.com
L: bluez-devel@lists.sf.net
L: linux-bluetooth@vger.kernel.org
W: http://bluez.sf.net
W: http://www.bluez.org
W: http://www.holtmann.org/linux/bluetooth/
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc/kernel/sys_sunos.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr)

socket = SOCKET_I(inode);
local.sin_family = AF_INET;
local.sin_addr.s_addr = INADDR_ANY;
local.sin_addr.s_addr = htonl(INADDR_ANY);

/* IPPORT_RESERVED = 1024, can't find the definition in the kernel */
try_port = 1024;
Expand Down
2 changes: 1 addition & 1 deletion arch/sparc64/kernel/sys_sunos32.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ sunos_nfs_get_server_fd (int fd, struct sockaddr_in *addr)

socket = SOCKET_I(inode);
local.sin_family = AF_INET;
local.sin_addr.s_addr = INADDR_ANY;
local.sin_addr.s_addr = htonl(INADDR_ANY);

/* IPPORT_RESERVED = 1024, can't find the definition in the kernel */
try_port = 1024;
Expand Down
110 changes: 55 additions & 55 deletions drivers/atm/fore200e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1988,19 +1988,19 @@ fore200e_fetch_stats(struct fore200e* fore200e, struct sonet_stats __user *arg)
if (fore200e_getstats(fore200e) < 0)
return -EIO;

tmp.section_bip = cpu_to_be32(fore200e->stats->oc3.section_bip8_errors);
tmp.line_bip = cpu_to_be32(fore200e->stats->oc3.line_bip24_errors);
tmp.path_bip = cpu_to_be32(fore200e->stats->oc3.path_bip8_errors);
tmp.line_febe = cpu_to_be32(fore200e->stats->oc3.line_febe_errors);
tmp.path_febe = cpu_to_be32(fore200e->stats->oc3.path_febe_errors);
tmp.corr_hcs = cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors);
tmp.uncorr_hcs = cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors);
tmp.tx_cells = cpu_to_be32(fore200e->stats->aal0.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal34.cells_transmitted) +
cpu_to_be32(fore200e->stats->aal5.cells_transmitted);
tmp.rx_cells = cpu_to_be32(fore200e->stats->aal0.cells_received) +
cpu_to_be32(fore200e->stats->aal34.cells_received) +
cpu_to_be32(fore200e->stats->aal5.cells_received);
tmp.section_bip = be32_to_cpu(fore200e->stats->oc3.section_bip8_errors);
tmp.line_bip = be32_to_cpu(fore200e->stats->oc3.line_bip24_errors);
tmp.path_bip = be32_to_cpu(fore200e->stats->oc3.path_bip8_errors);
tmp.line_febe = be32_to_cpu(fore200e->stats->oc3.line_febe_errors);
tmp.path_febe = be32_to_cpu(fore200e->stats->oc3.path_febe_errors);
tmp.corr_hcs = be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors);
tmp.uncorr_hcs = be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors);
tmp.tx_cells = be32_to_cpu(fore200e->stats->aal0.cells_transmitted) +
be32_to_cpu(fore200e->stats->aal34.cells_transmitted) +
be32_to_cpu(fore200e->stats->aal5.cells_transmitted);
tmp.rx_cells = be32_to_cpu(fore200e->stats->aal0.cells_received) +
be32_to_cpu(fore200e->stats->aal34.cells_received) +
be32_to_cpu(fore200e->stats->aal5.cells_received);

if (arg)
return copy_to_user(arg, &tmp, sizeof(struct sonet_stats)) ? -EFAULT : 0;
Expand Down Expand Up @@ -2587,7 +2587,7 @@ fore200e_start_fw(struct fore200e* fore200e)
static int __devinit
fore200e_load_fw(struct fore200e* fore200e)
{
u32* fw_data = (u32*) fore200e->bus->fw_data;
__le32* fw_data = (__le32*) fore200e->bus->fw_data;
u32 fw_size = (u32) *fore200e->bus->fw_size / sizeof(u32);

struct fw_header* fw_header = (struct fw_header*) fw_data;
Expand Down Expand Up @@ -2965,8 +2965,8 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" 4b5b:\n"
" crc_header_errors:\t\t%10u\n"
" framing_errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->phy.crc_header_errors),
cpu_to_be32(fore200e->stats->phy.framing_errors));
be32_to_cpu(fore200e->stats->phy.crc_header_errors),
be32_to_cpu(fore200e->stats->phy.framing_errors));

if (!left--)
return sprintf(page, "\n"
Expand All @@ -2978,13 +2978,13 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" path_febe_errors:\t\t%10u\n"
" corr_hcs_errors:\t\t%10u\n"
" ucorr_hcs_errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->oc3.section_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.path_bip8_errors),
cpu_to_be32(fore200e->stats->oc3.line_bip24_errors),
cpu_to_be32(fore200e->stats->oc3.line_febe_errors),
cpu_to_be32(fore200e->stats->oc3.path_febe_errors),
cpu_to_be32(fore200e->stats->oc3.corr_hcs_errors),
cpu_to_be32(fore200e->stats->oc3.ucorr_hcs_errors));
be32_to_cpu(fore200e->stats->oc3.section_bip8_errors),
be32_to_cpu(fore200e->stats->oc3.path_bip8_errors),
be32_to_cpu(fore200e->stats->oc3.line_bip24_errors),
be32_to_cpu(fore200e->stats->oc3.line_febe_errors),
be32_to_cpu(fore200e->stats->oc3.path_febe_errors),
be32_to_cpu(fore200e->stats->oc3.corr_hcs_errors),
be32_to_cpu(fore200e->stats->oc3.ucorr_hcs_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -2995,22 +2995,22 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" vpi no conn:\t\t%10u\n"
" vci out of range:\t\t%10u\n"
" vci no conn:\t\t%10u\n",
cpu_to_be32(fore200e->stats->atm.cells_transmitted),
cpu_to_be32(fore200e->stats->atm.cells_received),
cpu_to_be32(fore200e->stats->atm.vpi_bad_range),
cpu_to_be32(fore200e->stats->atm.vpi_no_conn),
cpu_to_be32(fore200e->stats->atm.vci_bad_range),
cpu_to_be32(fore200e->stats->atm.vci_no_conn));
be32_to_cpu(fore200e->stats->atm.cells_transmitted),
be32_to_cpu(fore200e->stats->atm.cells_received),
be32_to_cpu(fore200e->stats->atm.vpi_bad_range),
be32_to_cpu(fore200e->stats->atm.vpi_no_conn),
be32_to_cpu(fore200e->stats->atm.vci_bad_range),
be32_to_cpu(fore200e->stats->atm.vci_no_conn));

if (!left--)
return sprintf(page,"\n"
" AAL0:\t\t\t cells\n"
" TX:\t\t\t%10u\n"
" RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n",
cpu_to_be32(fore200e->stats->aal0.cells_transmitted),
cpu_to_be32(fore200e->stats->aal0.cells_received),
cpu_to_be32(fore200e->stats->aal0.cells_dropped));
be32_to_cpu(fore200e->stats->aal0.cells_transmitted),
be32_to_cpu(fore200e->stats->aal0.cells_received),
be32_to_cpu(fore200e->stats->aal0.cells_dropped));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3026,15 +3026,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" RX:\t\t\t%10u\n"
" dropped:\t\t\t%10u\n"
" protocol errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->aal34.cells_transmitted),
cpu_to_be32(fore200e->stats->aal34.cells_received),
cpu_to_be32(fore200e->stats->aal34.cells_dropped),
cpu_to_be32(fore200e->stats->aal34.cells_crc_errors),
cpu_to_be32(fore200e->stats->aal34.cells_protocol_errors),
cpu_to_be32(fore200e->stats->aal34.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal34.cspdus_received),
cpu_to_be32(fore200e->stats->aal34.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal34.cspdus_protocol_errors));
be32_to_cpu(fore200e->stats->aal34.cells_transmitted),
be32_to_cpu(fore200e->stats->aal34.cells_received),
be32_to_cpu(fore200e->stats->aal34.cells_dropped),
be32_to_cpu(fore200e->stats->aal34.cells_crc_errors),
be32_to_cpu(fore200e->stats->aal34.cells_protocol_errors),
be32_to_cpu(fore200e->stats->aal34.cspdus_transmitted),
be32_to_cpu(fore200e->stats->aal34.cspdus_received),
be32_to_cpu(fore200e->stats->aal34.cspdus_dropped),
be32_to_cpu(fore200e->stats->aal34.cspdus_protocol_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3050,15 +3050,15 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" dropped:\t\t\t%10u\n"
" CRC errors:\t\t%10u\n"
" protocol errors:\t\t%10u\n",
cpu_to_be32(fore200e->stats->aal5.cells_transmitted),
cpu_to_be32(fore200e->stats->aal5.cells_received),
cpu_to_be32(fore200e->stats->aal5.cells_dropped),
cpu_to_be32(fore200e->stats->aal5.congestion_experienced),
cpu_to_be32(fore200e->stats->aal5.cspdus_transmitted),
cpu_to_be32(fore200e->stats->aal5.cspdus_received),
cpu_to_be32(fore200e->stats->aal5.cspdus_dropped),
cpu_to_be32(fore200e->stats->aal5.cspdus_crc_errors),
cpu_to_be32(fore200e->stats->aal5.cspdus_protocol_errors));
be32_to_cpu(fore200e->stats->aal5.cells_transmitted),
be32_to_cpu(fore200e->stats->aal5.cells_received),
be32_to_cpu(fore200e->stats->aal5.cells_dropped),
be32_to_cpu(fore200e->stats->aal5.congestion_experienced),
be32_to_cpu(fore200e->stats->aal5.cspdus_transmitted),
be32_to_cpu(fore200e->stats->aal5.cspdus_received),
be32_to_cpu(fore200e->stats->aal5.cspdus_dropped),
be32_to_cpu(fore200e->stats->aal5.cspdus_crc_errors),
be32_to_cpu(fore200e->stats->aal5.cspdus_protocol_errors));

if (!left--)
return sprintf(page,"\n"
Expand All @@ -3069,11 +3069,11 @@ fore200e_proc_read(struct atm_dev *dev, loff_t* pos, char* page)
" large b2:\t\t\t%10u\n"
" RX PDUs:\t\t\t%10u\n"
" TX PDUs:\t\t\t%10lu\n",
cpu_to_be32(fore200e->stats->aux.small_b1_failed),
cpu_to_be32(fore200e->stats->aux.large_b1_failed),
cpu_to_be32(fore200e->stats->aux.small_b2_failed),
cpu_to_be32(fore200e->stats->aux.large_b2_failed),
cpu_to_be32(fore200e->stats->aux.rpd_alloc_failed),
be32_to_cpu(fore200e->stats->aux.small_b1_failed),
be32_to_cpu(fore200e->stats->aux.large_b1_failed),
be32_to_cpu(fore200e->stats->aux.small_b2_failed),
be32_to_cpu(fore200e->stats->aux.large_b2_failed),
be32_to_cpu(fore200e->stats->aux.rpd_alloc_failed),
fore200e->tx_sat);

if (!left--)
Expand Down
106 changes: 53 additions & 53 deletions drivers/atm/fore200e.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,90 +349,90 @@ typedef struct oc3_block {
/* physical encoding statistics */

typedef struct stats_phy {
u32 crc_header_errors; /* cells received with bad header CRC */
u32 framing_errors; /* cells received with bad framing */
u32 pad[ 2 ]; /* i960 padding */
__be32 crc_header_errors; /* cells received with bad header CRC */
__be32 framing_errors; /* cells received with bad framing */
__be32 pad[ 2 ]; /* i960 padding */
} stats_phy_t;


/* OC-3 statistics */

typedef struct stats_oc3 {
u32 section_bip8_errors; /* section 8 bit interleaved parity */
u32 path_bip8_errors; /* path 8 bit interleaved parity */
u32 line_bip24_errors; /* line 24 bit interleaved parity */
u32 line_febe_errors; /* line far end block errors */
u32 path_febe_errors; /* path far end block errors */
u32 corr_hcs_errors; /* correctable header check sequence */
u32 ucorr_hcs_errors; /* uncorrectable header check sequence */
u32 pad[ 1 ]; /* i960 padding */
__be32 section_bip8_errors; /* section 8 bit interleaved parity */
__be32 path_bip8_errors; /* path 8 bit interleaved parity */
__be32 line_bip24_errors; /* line 24 bit interleaved parity */
__be32 line_febe_errors; /* line far end block errors */
__be32 path_febe_errors; /* path far end block errors */
__be32 corr_hcs_errors; /* correctable header check sequence */
__be32 ucorr_hcs_errors; /* uncorrectable header check sequence */
__be32 pad[ 1 ]; /* i960 padding */
} stats_oc3_t;


/* ATM statistics */

typedef struct stats_atm {
u32 cells_transmitted; /* cells transmitted */
u32 cells_received; /* cells received */
u32 vpi_bad_range; /* cell drops: VPI out of range */
u32 vpi_no_conn; /* cell drops: no connection for VPI */
u32 vci_bad_range; /* cell drops: VCI out of range */
u32 vci_no_conn; /* cell drops: no connection for VCI */
u32 pad[ 2 ]; /* i960 padding */
__be32 cells_transmitted; /* cells transmitted */
__be32 cells_received; /* cells received */
__be32 vpi_bad_range; /* cell drops: VPI out of range */
__be32 vpi_no_conn; /* cell drops: no connection for VPI */
__be32 vci_bad_range; /* cell drops: VCI out of range */
__be32 vci_no_conn; /* cell drops: no connection for VCI */
__be32 pad[ 2 ]; /* i960 padding */
} stats_atm_t;

/* AAL0 statistics */

typedef struct stats_aal0 {
u32 cells_transmitted; /* cells transmitted */
u32 cells_received; /* cells received */
u32 cells_dropped; /* cells dropped */
u32 pad[ 1 ]; /* i960 padding */
__be32 cells_transmitted; /* cells transmitted */
__be32 cells_received; /* cells received */
__be32 cells_dropped; /* cells dropped */
__be32 pad[ 1 ]; /* i960 padding */
} stats_aal0_t;


/* AAL3/4 statistics */

typedef struct stats_aal34 {
u32 cells_transmitted; /* cells transmitted from segmented PDUs */
u32 cells_received; /* cells reassembled into PDUs */
u32 cells_crc_errors; /* payload CRC error count */
u32 cells_protocol_errors; /* SAR or CS layer protocol errors */
u32 cells_dropped; /* cells dropped: partial reassembly */
u32 cspdus_transmitted; /* CS PDUs transmitted */
u32 cspdus_received; /* CS PDUs received */
u32 cspdus_protocol_errors; /* CS layer protocol errors */
u32 cspdus_dropped; /* reassembled PDUs drop'd (in cells) */
u32 pad[ 3 ]; /* i960 padding */
__be32 cells_transmitted; /* cells transmitted from segmented PDUs */
__be32 cells_received; /* cells reassembled into PDUs */
__be32 cells_crc_errors; /* payload CRC error count */
__be32 cells_protocol_errors; /* SAR or CS layer protocol errors */
__be32 cells_dropped; /* cells dropped: partial reassembly */
__be32 cspdus_transmitted; /* CS PDUs transmitted */
__be32 cspdus_received; /* CS PDUs received */
__be32 cspdus_protocol_errors; /* CS layer protocol errors */
__be32 cspdus_dropped; /* reassembled PDUs drop'd (in cells) */
__be32 pad[ 3 ]; /* i960 padding */
} stats_aal34_t;


/* AAL5 statistics */

typedef struct stats_aal5 {
u32 cells_transmitted; /* cells transmitted from segmented SDUs */
u32 cells_received; /* cells reassembled into SDUs */
u32 cells_dropped; /* reassembled PDUs dropped (in cells) */
u32 congestion_experienced; /* CRC error and length wrong */
u32 cspdus_transmitted; /* CS PDUs transmitted */
u32 cspdus_received; /* CS PDUs received */
u32 cspdus_crc_errors; /* CS PDUs CRC errors */
u32 cspdus_protocol_errors; /* CS layer protocol errors */
u32 cspdus_dropped; /* reassembled PDUs dropped */
u32 pad[ 3 ]; /* i960 padding */
__be32 cells_transmitted; /* cells transmitted from segmented SDUs */
__be32 cells_received; /* cells reassembled into SDUs */
__be32 cells_dropped; /* reassembled PDUs dropped (in cells) */
__be32 congestion_experienced; /* CRC error and length wrong */
__be32 cspdus_transmitted; /* CS PDUs transmitted */
__be32 cspdus_received; /* CS PDUs received */
__be32 cspdus_crc_errors; /* CS PDUs CRC errors */
__be32 cspdus_protocol_errors; /* CS layer protocol errors */
__be32 cspdus_dropped; /* reassembled PDUs dropped */
__be32 pad[ 3 ]; /* i960 padding */
} stats_aal5_t;


/* auxiliary statistics */

typedef struct stats_aux {
u32 small_b1_failed; /* receive BD allocation failures */
u32 large_b1_failed; /* receive BD allocation failures */
u32 small_b2_failed; /* receive BD allocation failures */
u32 large_b2_failed; /* receive BD allocation failures */
u32 rpd_alloc_failed; /* receive PDU allocation failures */
u32 receive_carrier; /* no carrier = 0, carrier = 1 */
u32 pad[ 2 ]; /* i960 padding */
__be32 small_b1_failed; /* receive BD allocation failures */
__be32 large_b1_failed; /* receive BD allocation failures */
__be32 small_b2_failed; /* receive BD allocation failures */
__be32 large_b2_failed; /* receive BD allocation failures */
__be32 rpd_alloc_failed; /* receive PDU allocation failures */
__be32 receive_carrier; /* no carrier = 0, carrier = 1 */
__be32 pad[ 2 ]; /* i960 padding */
} stats_aux_t;


Expand Down Expand Up @@ -643,10 +643,10 @@ typedef struct host_bsq {
/* header of the firmware image */

typedef struct fw_header {
u32 magic; /* magic number */
u32 version; /* firmware version id */
u32 load_offset; /* fw load offset in board memory */
u32 start_offset; /* fw execution start address in board memory */
__le32 magic; /* magic number */
__le32 version; /* firmware version id */
__le32 load_offset; /* fw load offset in board memory */
__le32 start_offset; /* fw execution start address in board memory */
} fw_header_t;

#define FW_HEADER_MAGIC 0x65726f66 /* 'fore' */
Expand Down
Loading

0 comments on commit 7d3628b

Please sign in to comment.