← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to drivers/scsi/cxgbi/cxgb4i/cxgb4i.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
106
106
        .name           = DRV_MODULE_NAME,
107
107
        .caps           = CAP_RECOVERY_L0 | CAP_MULTI_R2T | CAP_HDRDGST |
108
108
                                CAP_DATADGST | CAP_DIGEST_OFFLOAD |
109
 
                                CAP_PADDING_OFFLOAD,
 
109
                                CAP_PADDING_OFFLOAD | CAP_TEXT_NEGO,
110
110
        .param_mask     = ISCSI_MAX_RECV_DLENGTH | ISCSI_MAX_XMIT_DLENGTH |
111
111
                                ISCSI_HDRDGST_EN | ISCSI_DATADGST_EN |
112
112
                                ISCSI_INITIAL_R2T_EN | ISCSI_MAX_R2T |
138
138
        .destroy_conn   = iscsi_tcp_conn_teardown,
139
139
        .start_conn             = iscsi_conn_start,
140
140
        .stop_conn              = iscsi_conn_stop,
141
 
        .get_conn_param = cxgbi_get_conn_param,
 
141
        .get_conn_param = iscsi_conn_get_param,
142
142
        .set_param      = cxgbi_set_conn_param,
143
143
        .get_stats      = cxgbi_get_conn_stats,
144
144
        /* pdu xmit req from user space */
153
153
        .xmit_pdu       = cxgbi_conn_xmit_pdu,
154
154
        .parse_pdu_itt  = cxgbi_parse_pdu_itt,
155
155
        /* TCP connect/disconnect */
 
156
        .get_ep_param   = cxgbi_get_ep_param,
156
157
        .ep_connect     = cxgbi_ep_connect,
157
158
        .ep_poll        = cxgbi_ep_poll,
158
159
        .ep_disconnect  = cxgbi_ep_disconnect,
1425
1426
        cxgbi_ddp_page_size_factor(pgsz_factor);
1426
1427
        cxgb4_iscsi_init(lldi->ports[0], tagmask, pgsz_factor);
1427
1428
 
1428
 
        cdev->csk_ddp_free_gl_skb = NULL;
1429
 
        cdev->csk_ddp_alloc_gl_skb = NULL;
1430
1429
        cdev->csk_ddp_setup_digest = ddp_setup_conn_digest;
1431
1430
        cdev->csk_ddp_setup_pgidx = ddp_setup_conn_pgidx;
1432
1431
        cdev->csk_ddp_set = ddp_set_map;