Commit 230f9bb7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 



Conflicts:
	drivers/net/usb/cdc_ether.c

All CDC ethernet devices of type USB_CLASS_COMM need to use
'&mbm_info'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 000ba2e4 887e671f

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3655,6 +3655,7 @@ 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/

drivers/isdn/hardware/eicon/maintidi.c

+3 −2
Original line number Diff line number Diff line
@@ -960,7 +960,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;

    diva_strace_read_uint (pVar, &l2_state);

		if (diva_strace_read_uint(pVar, &l2_state))

			return -1;



		switch (l2_state) {

			case 0:

drivers/isdn/hardware/eicon/message.c

+9 −9
Original line number Diff line number Diff line
@@ -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 = (byte)(&(((T30_INFO *) 0)->universal_6));

            len = offsetof(T30_INFO, universal_6);

            fax_info_change = false;

            if (ncpi->length >= 4)

            {
@@ -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 = (byte)(((T30_INFO *) 0)->station_id + 20);

                    len = offsetof(T30_INFO, station_id) + 20;

                    w = fax_parms[5].length;

                    if (w > 20)

                      w = 20;
@@ -2788,7 +2788,7 @@ static byte connect_b3_req(dword Id, word Number, DIVA_CAPI_ADAPTER *a, 
                }

                else

                {

                  len = (byte)(&(((T30_INFO *) 0)->universal_6));

                  len = offsetof(T30_INFO, universal_6);

                }

                fax_info_change = true;
@@ -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 = ((byte)(((T30_INFO *) 0)->station_id + 20));

            len = offsetof(T30_INFO, station_id) + 20;

            if (plci->fax_connect_info_length < len)

            {

              ((T30_INFO *)(plci->fax_connect_info_buffer))->station_id_len = 0;
@@ -3802,7 +3802,7 @@ static byte manufacturer_res(dword Id, word Number, DIVA_CAPI_ADAPTER *a, 
      break;

    }

    ncpi = &m_parms[1];

    len = ((byte)(((T30_INFO *) 0)->station_id + 20));

    len = offsetof(T30_INFO, station_id) + 20;

    if (plci->fax_connect_info_length < len)

    {

      ((T30_INFO *)(plci->fax_connect_info_buffer))->station_id_len = 0;
@@ -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 = ((word)(((T30_INFO *) 0)->station_id + 20)) + ((T30_INFO   *)plci->NL.RBuffer->P)->head_line_len;

          i = offsetof(T30_INFO, 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++];

        }
@@ -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 + (-((int) v120_header_buffer) & 3);

      plci->RData[0].P = v120_header_buffer + (-((unsigned long)v120_header_buffer) & 3);

      if ((plci->NL.RBuffer->P[0] & V120_HEADER_EXTEND_BIT) || (plci->NL.RLength == 1))

        plci->RData[0].PLength = 1;

      else
@@ -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 = ((byte)(((T30_INFO *) 0)->station_id + 20));

          pos = offsetof(T30_INFO, station_id) + 20;

   if (pos < plci->fax_connect_info_length)

   {

     for (i = 1 + plci->fax_connect_info_buffer[pos]; i != 0; i--)
@@ -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 = ((byte)(((T30_INFO *) 0)->station_id + 20));

      len = offsetof(T30_INFO, 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;

drivers/isdn/hisax/amd7930_fn.c

+1 −0
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ 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)

drivers/isdn/hisax/diva.c

+1 −1
Original line number Diff line number Diff line
@@ -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--;

	}