X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=deblob-3.4;h=41ecc8a42041c3d7a5758ec7838e612b84b0cbe4;hb=ca5d589108db9d2fde6f518ad3ae4b23b6e825fc;hp=6aa312a77fde4dd90184aadcedf8ebcb0a405c47;hpb=e0df7433300d517349b986dff77a02990c0e91d9;p=releases.git

diff --git a/deblob-3.4 b/deblob-3.4
index 6aa312a77fde..41ecc8a42041 100755
--- a/deblob-3.4
+++ b/deblob-3.4
@@ -48,7 +48,7 @@
 
 # For each kver release, start extra with an empty string, then count
 # from 1 if changes are needed that require rebuilding the tarball.
-kver=3.4 extra=0--
+kver=3.4 extra=
 
 case $1 in
 --force)
@@ -1132,7 +1132,23 @@ clean_sed '
 	  -EINVAL)
 }' drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c 'report missing Free firmware'
 clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+clean_sed '
+/^bool bnx2x_test_firmware_version/,/^}$/{
+  /^	u32 my_fw = /i\
+	/*(DEBLOBBED)*/
+  /^	u32 my_fw = /,/<< 24);/d;
+  /^	u32 loaded_fw = /,/^$/{
+    /^$/i\
+\
+	u32 my_fw = ~loaded_fw;
+  }
+}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c 'fail already-loaded test'
 clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+clean_sed '
+/static void bnx2x_init_wr_wb/{
+  i\
+extern void bnx2x_init_wr_wb(struct bnx2x *, u32, const u32 *, u32);
+}' drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h 'declare removed function'
 clean_blob drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
 clean_kconfig drivers/net/ethernet/broadcom/Kconfig 'BNX2X'
 clean_mk CONFIG_BNX2X drivers/net/ethernet/broadcom/bnx2x/Makefile