Skip to content

Commit 1b0d55d

Browse files
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed into topic/uek-4.1/ofed
2 parents 76c2146 + e989067 commit 1b0d55d

File tree

15 files changed

+1164
-422
lines changed

15 files changed

+1164
-422
lines changed

drivers/infiniband/ulp/xsigo/xscore/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ obj-$(CONFIG_INFINIBAND_XSCORE) := xscore.o
22
xscore-y := xscore_impl.o xs_ud.o xscore_api.o xsmp.o \
33
xscore_stats.o xscore_uadm.o
44

5-
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
5+
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
66
ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
77
ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
88
ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT

drivers/infiniband/ulp/xsigo/xsvhba/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ xsvhba-y := vhba_main.o vhba_xsmp.o vhba_create.o vhba_init.o vhba_delete.o \
33
vhba_attr.o vhba_wq.o vhba_proc.o vhba_stats.o vhba_ib.o \
44
vhba_scsi_intf.o vhba_align.o
55

6-
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
6+
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
77
ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
88
ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
99
ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT

drivers/infiniband/ulp/xsigo/xsvhba/vhba_main.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,25 @@ MODULE_VERSION(DRIVER_VERSION);
7171
***********************************/
7272

7373
int cmds_per_lun = 16;
74-
module_param(cmds_per_lun, int, S_IRWXU);
74+
module_param(cmds_per_lun, int, 0644);
7575

7676
int vhba_multiple_q = 1;
77-
module_param(vhba_multiple_q, int, S_IRWXU);
77+
module_param(vhba_multiple_q, int, 0644);
7878

7979
int vhba_max_transfer_size = VHBA_DEFAULT_TRANSFER_SIZE;
80-
module_param(vhba_max_transfer_size, int, S_IRWXU);
80+
module_param(vhba_max_transfer_size, int, 0644);
8181

8282
int vhba_max_q_depth = VHBA_MAX_VH_Q_DEPTH;
83-
module_param(vhba_max_q_depth, int, S_IRWXU);
83+
module_param(vhba_max_q_depth, int, 0644);
8484

8585
int vhba_debug = 0x200001;
8686
module_param(vhba_debug, int, 0644);
8787

8888
int vhba_max_scsi_retry = VHBA_MAX_SCSI_RETRY;
89-
module_param(vhba_max_scsi_retry, int, S_IRWXU);
89+
module_param(vhba_max_scsi_retry, int, 0644);
9090

9191
int vhba_default_scsi_timeout = VHBA_DEFAULT_SCSI_TIMEOUT;
92-
module_param(vhba_default_scsi_timeout, int, S_IRWXU);
92+
module_param(vhba_default_scsi_timeout, int, 0644);
9393

9494
int vhba_wait_in_boot = 1;
9595
module_param(vhba_wait_in_boot, int, 0644);

drivers/infiniband/ulp/xsigo/xsvnic/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
obj-$(CONFIG_INFINIBAND_XSVNIC) := xsvnic.o
22
xsvnic-y := xsvnic_main.o xsvnic_stats.o
33

4-
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
4+
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
55
ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
66
ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
77
ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT

drivers/infiniband/ulp/xsigo/xve/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ obj-$(CONFIG_INFINIBAND_XVE) := xve.o
22
xve-y := xve_main.o xve_verbs.o xve_multicast.o xve_ib.o xve_tables.o \
33
xve_ethtool.o xve_cm.o xve_stats.o
44

5-
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8004\"
5+
ccflags-y += -DXSIGO_LOCAL_VERSION=\"6.0.r8008\"
66
ccflags-y += -DRDMA_PORT_LINK_LAYER_CHANGES -DHAS_SKB_ACCESS_FUNCTIONS
77
ccflags-y += -DSCSI_STRUCT_CHANGES -DSCSI_TIMEOUT_CHANGES -DLLE
88
ccflags-y += -DXG_FRAG_SIZE_PRESENT -DXG_FRAG_PAGE_PRESENT

0 commit comments

Comments
 (0)