Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 171252
b: refs/heads/master
c: 69d9ab9
h: refs/heads/master
v: v3
  • Loading branch information
Dmitry Eremin-Solenikov committed Nov 6, 2009
1 parent afb12cc commit 0008641
Show file tree
Hide file tree
Showing 151 changed files with 1,138 additions and 3,213 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62d83681e53fd87c91927018cfe5ba9f9e8109a3
refs/heads/master: 69d9ab96f983720b7794e91437bd9c5f83bae9f7
1 change: 0 additions & 1 deletion trunk/MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3655,7 +3655,6 @@ L: netdev@vger.kernel.org
W: http://www.linuxfoundation.org/en/Net
W: http://patchwork.ozlabs.org/project/netdev/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
S: Maintained
F: net/
F: include/net/
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/isdn/hardware/eicon/maintidi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,9 +959,8 @@ static int process_idi_event (diva_strace_context_t* pLib,
}
if (!strncmp("State\\Layer2 No1", path, pVar->path_length)) {
char* tmp = &pLib->lines[0].pInterface->Layer2[0];
dword l2_state;
if (diva_strace_read_uint(pVar, &l2_state))
return -1;
dword l2_state;
diva_strace_read_uint (pVar, &l2_state);

switch (l2_state) {
case 0:
Expand Down
18 changes: 9 additions & 9 deletions trunk/drivers/isdn/hardware/eicon/message.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2692,7 +2692,7 @@ static byte connect_b3_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
if (!(fax_control_bits & T30_CONTROL_BIT_MORE_DOCUMENTS)
|| (fax_feature_bits & T30_FEATURE_BIT_MORE_DOCUMENTS))
{
len = offsetof(T30_INFO, universal_6);
len = (byte)(&(((T30_INFO *) 0)->universal_6));
fax_info_change = false;
if (ncpi->length >= 4)
{
Expand Down Expand Up @@ -2754,7 +2754,7 @@ static byte connect_b3_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
for (i = 0; i < w; i++)
((T30_INFO *)(plci->fax_connect_info_buffer))->station_id[i] = fax_parms[4].info[1+i];
((T30_INFO *)(plci->fax_connect_info_buffer))->head_line_len = 0;
len = offsetof(T30_INFO, station_id) + 20;
len = (byte)(((T30_INFO *) 0)->station_id + 20);
w = fax_parms[5].length;
if (w > 20)
w = 20;
Expand Down Expand Up @@ -2788,7 +2788,7 @@ static byte connect_b3_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
}
else
{
len = offsetof(T30_INFO, universal_6);
len = (byte)(&(((T30_INFO *) 0)->universal_6));
}
fax_info_change = true;

Expand Down Expand Up @@ -2892,7 +2892,7 @@ static byte connect_b3_res(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
&& (plci->nsf_control_bits & T30_NSF_CONTROL_BIT_ENABLE_NSF)
&& (plci->nsf_control_bits & T30_NSF_CONTROL_BIT_NEGOTIATE_RESP))
{
len = offsetof(T30_INFO, station_id) + 20;
len = ((byte)(((T30_INFO *) 0)->station_id + 20));
if (plci->fax_connect_info_length < len)
{
((T30_INFO *)(plci->fax_connect_info_buffer))->station_id_len = 0;
Expand Down Expand Up @@ -3802,7 +3802,7 @@ static byte manufacturer_res(dword Id, word Number, DIVA_CAPI_ADAPTER *a,
break;
}
ncpi = &m_parms[1];
len = offsetof(T30_INFO, station_id) + 20;
len = ((byte)(((T30_INFO *) 0)->station_id + 20));
if (plci->fax_connect_info_length < len)
{
((T30_INFO *)(plci->fax_connect_info_buffer))->station_id_len = 0;
Expand Down Expand Up @@ -6844,7 +6844,7 @@ static void nl_ind(PLCI *plci)
if ((plci->requested_options_conn | plci->requested_options | a->requested_options_table[plci->appl->Id-1])
& ((1L << PRIVATE_FAX_SUB_SEP_PWD) | (1L << PRIVATE_FAX_NONSTANDARD)))
{
i = offsetof(T30_INFO, station_id) + 20 + ((T30_INFO *)plci->NL.RBuffer->P)->head_line_len;
i = ((word)(((T30_INFO *) 0)->station_id + 20)) + ((T30_INFO *)plci->NL.RBuffer->P)->head_line_len;
while (i < plci->NL.RBuffer->length)
plci->ncpi_buffer[++len] = plci->NL.RBuffer->P[i++];
}
Expand Down Expand Up @@ -7236,7 +7236,7 @@ static void nl_ind(PLCI *plci)
{
plci->RData[1].P = plci->RData[0].P;
plci->RData[1].PLength = plci->RData[0].PLength;
plci->RData[0].P = v120_header_buffer + (-((unsigned long)v120_header_buffer) & 3);
plci->RData[0].P = v120_header_buffer + (-((int) v120_header_buffer) & 3);
if ((plci->NL.RBuffer->P[0] & V120_HEADER_EXTEND_BIT) || (plci->NL.RLength == 1))
plci->RData[0].PLength = 1;
else
Expand Down Expand Up @@ -8473,7 +8473,7 @@ static word add_b23(PLCI *plci, API_PARSE *bp)
fax_control_bits |= T30_CONTROL_BIT_ACCEPT_SEL_POLLING;
}
len = nlc[0];
pos = offsetof(T30_INFO, station_id) + 20;
pos = ((byte)(((T30_INFO *) 0)->station_id + 20));
if (pos < plci->fax_connect_info_length)
{
for (i = 1 + plci->fax_connect_info_buffer[pos]; i != 0; i--)
Expand Down Expand Up @@ -8525,7 +8525,7 @@ static word add_b23(PLCI *plci, API_PARSE *bp)
}

PUT_WORD(&(((T30_INFO *)&nlc[1])->control_bits_low), fax_control_bits);
len = offsetof(T30_INFO, station_id) + 20;
len = ((byte)(((T30_INFO *) 0)->station_id + 20));
for (i = 0; i < len; i++)
plci->fax_connect_info_buffer[i] = nlc[1+i];
((T30_INFO *) plci->fax_connect_info_buffer)->head_line_len = 0;
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/isdn/hisax/amd7930_fn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,6 @@ Amd7930_l1hw(struct PStack *st, int pr, void *arg)
if (cs->debug & L1_DEB_WARN)
debugl1(cs, "Amd7930: l1hw: l2l1 tx_skb exist this shouldn't happen");
skb_queue_tail(&cs->sq, skb);
spin_unlock_irqrestore(&cs->lock, flags);
break;
}
if (cs->debug & DEB_DLOG_HEX)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/hisax/diva.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ MemwaitforXFW(struct IsdnCardState *cs, int hscx)
{
int to = 50;

while (((MemReadHSCX(cs, hscx, HSCX_STAR) & 0x44) != 0x40) && to) {
while ((!(MemReadHSCX(cs, hscx, HSCX_STAR) & 0x44) == 0x40) && to) {
udelay(1);
to--;
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/isdn/hisax/hfc_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,8 +817,8 @@ collect_rx_frame(usb_fifo * fifo, __u8 * data, int len, int finish)
}
/* we have a complete hdlc packet */
if (finish) {
if (fifo->skbuff->len > 3 &&
!fifo->skbuff->data[fifo->skbuff->len - 1]) {
if ((!fifo->skbuff->data[fifo->skbuff->len - 1])
&& (fifo->skbuff->len > 3)) {

if (fifon == HFCUSB_D_RX) {
DBG(HFCUSB_DBG_DCHANNEL,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/hisax/hscx_irq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ waitforXFW(struct IsdnCardState *cs, int hscx)
{
int to = 50;

while (((READHSCX(cs, hscx, HSCX_STAR) & 0x44) != 0x40) && to) {
while ((!(READHSCX(cs, hscx, HSCX_STAR) & 0x44) == 0x40) && to) {
udelay(1);
to--;
}
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/isdn/hisax/icc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,6 @@ ICC_l1hw(struct PStack *st, int pr, void *arg)
if (cs->debug & L1_DEB_WARN)
debugl1(cs, " l2l1 tx_skb exist this shouldn't happen");
skb_queue_tail(&cs->sq, skb);
spin_unlock_irqrestore(&cs->lock, flags);
break;
}
if (cs->debug & DEB_DLOG_HEX)
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/mISDN/socket.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ base_sock_create(struct net *net, struct socket *sock, int protocol)
}

static int
mISDN_sock_create(struct net *net, struct socket *sock, int proto, int kern)
mISDN_sock_create(struct net *net, struct socket *sock, int proto)
{
int err = -EPROTONOSUPPORT;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/mISDN/stack.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ add_layer2(struct mISDNchannel *ch, struct mISDNstack *st)
static int
st_own_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
{
if (!ch->st || !ch->st->layer1)
if (!ch->st || ch->st->layer1)
return -EINVAL;
return ch->st->layer1->ctrl(ch->st->layer1, cmd, arg);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/benet/be_cmds.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ enum {
#define CQE_STATUS_COMPL_MASK 0xFFFF
#define CQE_STATUS_COMPL_SHIFT 0 /* bits 0 - 15 */
#define CQE_STATUS_EXTD_MASK 0xFFFF
#define CQE_STATUS_EXTD_SHIFT 16 /* bits 16 - 31 */
#define CQE_STATUS_EXTD_SHIFT 0 /* bits 0 - 15 */

struct be_mcc_compl {
u32 status; /* dword 0 */
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/net/bnx2x_hsi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ struct port_hw_cfg { /* port 0: 0x12c port 1: 0x2bc */
#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_SFX7101 0x00000800
#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727 0x00000900
#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM8727_NOC 0x00000a00
#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_BCM84823 0x00000b00
#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_FAILURE 0x0000fd00
#define PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN 0x0000ff00

Expand Down
Loading

0 comments on commit 0008641

Please sign in to comment.