Patching Wireshark-1.6 with simcard-for-wireshark-1.6.patch is failing

[Jan Henrik Krågtorp]

I am having problems patching Wireshark with the simtracer patch.

I am using a Debian VM:
root at osmocom:/home/omsocom/simtrace/host# uname -a
Linux osmocom 2.6.32-5-686 #1 SMP Thu Nov 3 04:23:54 UTC 2011 i686 GNU/Linux

== The patching ==

root at osmocom:/home/osmocom/wireshark-1.6# cat
simcard-for-wireshark-1.6.patch | patch -p 0
patching file epan/dissectors/packet-card_app_toolkit.c
patching file epan/dissectors/packet-gsm_sim.c
patching file epan/dissectors/packet-gsmtap.c
Hunk #2 FAILED at 300.
1 out of 3 hunks FAILED -- saving rejects to file
epan/dissectors/packet-gsmtap.c.rej
patching file epan/dissectors/Makefile.common

== The reject file of the patching attempt ==

root at osmocom:/home/osmocom/wireshark-1.6# cat
epan/dissectors/packet-gsmtap.c.rej
--- epan/dissectors/packet-gsmtap.c    (revision 38554)
+++ epan/dissectors/packet-gsmtap.c    (working copy)
@@ -300,6 +301,13 @@

     col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSMTAP");

+    /* Some GSMTAP types are completely unrelated to the Um air interface
*/
+    switch (type) {
+    case GSMTAP_TYPE_SIM:
+        call_dissector(sub_handles[GSMTAP_SUB_SIM], payload_tvb, pinfo,
tree);
+        return;
+    }
+
     if (arfcn & GSMTAP_ARFCN_F_UPLINK) {
         col_append_str(pinfo->cinfo, COL_RES_NET_SRC, "MS");
         col_append_str(pinfo->cinfo, COL_RES_NET_DST, "BTS");

Any advice on how to solve this issue?

regards
Jan H
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/simtrace/attachments/20120121/bc6489c8/attachment.htm>